Merge branch 'release_1.13.0'

1231 files changed, 26578 insertions, 12217 deletions

diff --git a/bundles/javafx/org.eclipse.emf.ecp.application.e4.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.application.e4.fx/META-INF/MANIFEST.MF
index 11ec1ee086..890b1d5f7d 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.application.e4.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.application.e4.fx/META-INF/MANIFEST.MF
@@ -11,10 +11,10 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="[1.1.100,2.0.0
  org.eclipse.e4.ui.di;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.7.0,1.8.0)",
- org.eclipse.emf.ecp.controls.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.controls.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.fx.util;bundle-version="[1.8.0,1.9.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.annotation;version="1.0.0",
diff --git a/bundles/javafx/org.eclipse.emf.ecp.controls.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.controls.fx/META-INF/MANIFEST.MF
index ad8afc4f6e..8943de0bf6 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.controls.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.controls.fx/META-INF/MANIFEST.MF
@@ -9,18 +9,18 @@ Export-Package: org.eclipse.emf.ecp.controls.fx.util;x-internal:=true,
  org.eclipse.emf.ecp.controls.internal.fx;x-internal:=true,
  org.eclipse.emf.ecp.controls.renderer.fx
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property,
  org.eclipse.fx.core.databinding,
  org.eclipse.emf.databinding,
  org.eclipse.emf.ecore,
  org.eclipse.fx.emf.edit.ui,
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit,
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.ibm.icu.text;version="50.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/javafx/org.eclipse.emf.ecp.view.group.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.view.group.fx/META-INF/MANIFEST.MF
index c6513e0ce2..29c6994abe 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.view.group.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.view.group.fx/META-INF/MANIFEST.MF
@@ -6,10 +6,10 @@ Bundle-Version: 1.9.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.group.fx.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.view.group.fx;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/javafx/org.eclipse.emf.ecp.view.horizontal.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.view.horizontal.fx/META-INF/MANIFEST.MF
index 02b3f01f0e..a0f61a0032 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.view.horizontal.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.view.horizontal.fx/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Activator: org.eclipse.emf.ecp.view.horizontal.fx.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.view.horizontal.fx;version="1.9.0"
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/javafx/org.eclipse.emf.ecp.view.label.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.view.label.fx/META-INF/MANIFEST.MF
index 615840f092..1fa81aa2d5 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.view.label.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.view.label.fx/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Fx
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.fx;singleton:=true
 Bundle-Version: 1.9.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/javafx/org.eclipse.emf.ecp.view.model.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.view.model.fx/META-INF/MANIFEST.MF
index ae642f626b..2fe25db0fe 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.view.model.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.view.model.fx/META-INF/MANIFEST.MF
@@ -8,14 +8,14 @@ Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.view.model.fx;version="1.9.0",
  org.eclipse.emf.ecp.view.model.internal.fx;version="1.9.0"
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.fx.core.databinding;bundle-version="1.0.0",
  org.eclipse.core.databinding.property;bundle-version="1.4.200",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit,
  org.eclipse.emf.databinding.edit
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/javafx/org.eclipse.emf.ecp.view.treemasterdetail.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.view.treemasterdetail.fx/META-INF/MANIFEST.MF
index 43005648c8..8f139f829d 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.view.treemasterdetail.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.view.treemasterdetail.fx/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@ Bundle-Version: 1.9.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.treemasterdetail.fx.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.fx;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.fx.emf.edit.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="2.9.0",
- org.eclipse.emf.ecp.util.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.util.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.fx.ui.controls;bundle-version="[2.0.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/bundles/javafx/org.eclipse.emf.ecp.view.vertical.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.view.vertical.fx/META-INF/MANIFEST.MF
index 2e259b4f09..47e6933414 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.view.vertical.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.view.vertical.fx/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Activator: org.eclipse.emf.ecp.view.vertical.fx.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.view.vertical.fx;version="1.9.0"
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/javafx/org.eclipse.emf.ecp.viewmodel.fx/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.ecp.viewmodel.fx/META-INF/MANIFEST.MF
index 4fef3553dd..6203ae8da3 100644
--- a/bundles/javafx/org.eclipse.emf.ecp.viewmodel.fx/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.ecp.viewmodel.fx/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: Viewmodel
 Bundle-SymbolicName: org.eclipse.emf.ecp.viewmodel.fx;singleton:=true
 Bundle-Version: 1.7.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/javafx/org.eclipse.emf.emfstore.fx.projects/META-INF/MANIFEST.MF b/bundles/javafx/org.eclipse.emf.emfstore.fx.projects/META-INF/MANIFEST.MF
index 722592dba0..28f603d851 100644
--- a/bundles/javafx/org.eclipse.emf.emfstore.fx.projects/META-INF/MANIFEST.MF
+++ b/bundles/javafx/org.eclipse.emf.emfstore.fx.projects/META-INF/MANIFEST.MF
@@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0]",
  org.eclipse.fx.emf.edit.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.edit,
  org.eclipse.emf.ecore,
- org.eclipse.emf.ecp.util.fx;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.util.fx;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.ui.workbench,
- org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.fx.ui.controls;bundle-version="[2.0.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.annotation;version="1.1.0",
diff --git a/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
index 6dddf11684..950910be85 100644
--- a/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Demo Application Eclipse 3.x
 Bundle-SymbolicName: org.eclipse.emf.ecp.application.e3;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.application3x.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.application3x;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.application3x;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui.e3;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.application.e3/pom.xml b/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
index 36344a99e1..5d3a0c571d 100644
--- a/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.application.e3</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
index 4feae06cfa..ff832f9996 100644
--- a/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP e4 Application
 Bundle-SymbolicName: org.eclipse.emf.ecp.application.e4;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,2.0.0)",
+ org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,3.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.equinox.event;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.2.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.application.e4/pom.xml b/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
index f123e06de8..d732c313e0 100644
--- a/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.application.e4</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
index 93511ba1f3..ebfaafd84a 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP CDO Model Repository Core
 Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.core;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.cdo.internal.core.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.12.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
+Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.13.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.cdo.net4j;bundle-version="[4.1.0,5.0.0)",
  org.eclipse.emf.cdo.workspace;bundle-version="[4.1.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.server.db;bundle-version="[4.1.0,5.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
index cdd33a1405..a79dcc7d66 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.cdo.core</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
index 33b904fc45..7ed936f061 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Model Repository ECP UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.ui;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.cdo.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.cdo.internal.ui;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.cdo.internal.ui;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.cdo.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.cdo.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
index 2a01f7b77d..78cde3e6ad 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.cdo.ui</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF
index 59c7841446..cb27647b5c 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker Provider Bridge
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
index dfe74d85ca..8cf1671bd8 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.changebroker.provider</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF
index fa8e4420d4..1dd01a78cb 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.changebroker/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.changebroker.spi;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.changebroker.spi;version="1.13.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.emf.ecp.changebroker/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
index c6920592d3..9d0d058c1e 100644
--- a/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.changebroker</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF
index 6b21e58040..c543444a70 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.common.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.common.ui;version="1.12.0",
- org.eclipse.emf.ecp.spi.common.ui.composites;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.common.ui;version="1.13.0",
+ org.eclipse.emf.ecp.spi.common.ui.composites;version="1.13.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/pom.xml b/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
index 0e00d633eb..9b50d83dae 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.common.ui</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedEStructuralFeatureCompositeImpl.java b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedEStructuralFeatureCompositeImpl.java
index 80129d185b..309c62e053 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedEStructuralFeatureCompositeImpl.java
+++ b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedEStructuralFeatureCompositeImpl.java
@@ -72,7 +72,7 @@ public class CheckedEStructuralFeatureCompositeImpl extends SelectModelElementCo
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).span(2, 1).applyTo(buttons);
 
 		final Button buttonAll = new Button(buttons, SWT.PUSH);
-		buttonAll.setText(LocalizationServiceHelper.getString(getClass(),
+		buttonAll.setText(LocalizationServiceHelper.getString(CheckedEStructuralFeatureCompositeImpl.class,
 			MessageKeys.CheckedModelElementHelper_SelectAllLabel));
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(buttonAll);
 		buttonAll.addSelectionListener(new SelectionAdapter() {
@@ -85,7 +85,7 @@ public class CheckedEStructuralFeatureCompositeImpl extends SelectModelElementCo
 		});
 
 		final Button buttonNone = new Button(buttons, SWT.PUSH);
-		buttonNone.setText(LocalizationServiceHelper.getString(getClass(),
+		buttonNone.setText(LocalizationServiceHelper.getString(CheckedEStructuralFeatureCompositeImpl.class,
 			MessageKeys.CheckedModelElementHelper_DeselectAllLabel));
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(buttonNone);
 		buttonNone.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedSelectModelClassCompositeImpl.java b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedSelectModelClassCompositeImpl.java
index 0b9abd0f24..54d80fb0cd 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedSelectModelClassCompositeImpl.java
+++ b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/CheckedSelectModelClassCompositeImpl.java
@@ -72,7 +72,7 @@ public class CheckedSelectModelClassCompositeImpl extends AbstractEClassTreeSele
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).span(2, 1).applyTo(buttons);
 
 		final Button buttonAll = new Button(buttons, SWT.PUSH);
-		buttonAll.setText(LocalizationServiceHelper.getString(getClass(),
+		buttonAll.setText(LocalizationServiceHelper.getString(CheckedSelectModelClassCompositeImpl.class,
 			MessageKeys.CheckedModelElementHelper_SelectAllLabel));
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(buttonAll);
 		buttonAll.addSelectionListener(new SelectionAdapter() {
@@ -84,7 +84,7 @@ public class CheckedSelectModelClassCompositeImpl extends AbstractEClassTreeSele
 			}
 		});
 		final Button buttonNone = new Button(buttons, SWT.PUSH);
-		buttonNone.setText(LocalizationServiceHelper.getString(getClass(),
+		buttonNone.setText(LocalizationServiceHelper.getString(CheckedSelectModelClassCompositeImpl.class,
 			MessageKeys.CheckedModelElementHelper_DeselectAllLabel));
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(buttonNone);
 		buttonNone.addSelectionListener(new SelectionAdapter() {
diff --git a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
index 9dac52b6ac..65176eecae 100644
--- a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Common
 Bundle-SymbolicName: org.eclipse.emf.ecp.common
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.12.0",
- org.eclipse.emf.ecp.common.spi.asserts;version="1.12.0",
- org.eclipse.emf.ecp.common.spi.cachetree;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.13.0",
+ org.eclipse.emf.ecp.common.spi.asserts;version="1.13.0",
+ org.eclipse.emf.ecp.common.spi.cachetree;version="1.13.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.common/pom.xml b/bundles/org.eclipse.emf.ecp.common/pom.xml
index 6385e7f38d..4fca8855c5 100644
--- a/bundles/org.eclipse.emf.ecp.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.common</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
index bbc0322df5..524edbe17b 100644
--- a/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Emffilter
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.emffilter;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.core.emffilter.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.emffilter.internal;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.emffilter.internal;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml b/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
index 756f065a8f..bc4c990290 100644
--- a/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core.emffilter</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
index dfa2ef3069..02b75d2364 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP Sessionprovider
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.servlet.http;version="0.0.0",
- org.eclipse.emf.ecp.core.rap;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.13.0,1.14.0)",
  org.eclipse.rap.rwt;version="0.0.0",
  org.eclipse.rap.rwt.service;version="3.0.2"
 Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml
index 772d535dfd..2922c4c5d8 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.rwt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF
index f6ed59f247..2c26295dbf 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.core.rap.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.core.rap;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
  org.eclipse.net4j.util.lifecycle;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.core.rap/pom.xml b/bundles/org.eclipse.emf.ecp.core.rap/pom.xml
index 4a2fe0c759..7f027bf8f4 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core.rap</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
index f34c5f56e7..788043a3fa 100644
--- a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core
 Bundle-SymbolicName: org.eclipse.emf.ecp.core;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.core.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core;version="1.12.0",
- org.eclipse.emf.ecp.core.exceptions;version="1.12.0",
- org.eclipse.emf.ecp.core.util;version="1.12.0",
- org.eclipse.emf.ecp.core.util.observer;version="1.12.0",
- org.eclipse.emf.ecp.internal.core;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.core;version="1.13.0",
+ org.eclipse.emf.ecp.core.exceptions;version="1.13.0",
+ org.eclipse.emf.ecp.core.util;version="1.13.0",
+ org.eclipse.emf.ecp.core.util.observer;version="1.13.0",
+ org.eclipse.emf.ecp.internal.core;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.ui,
    org.eclipse.emf.ecp.ui.view.test,
    org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.core.rap",
- org.eclipse.emf.ecp.internal.core.properties;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.core.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui",
- org.eclipse.emf.ecp.internal.core.util.observer;version="1.12.0";x-friends:="org.eclipse.emf.ecp.core.rap",
- org.eclipse.emf.ecp.spi.core;version="1.12.0",
- org.eclipse.emf.ecp.spi.core.util;version="1.12.0"
+ org.eclipse.emf.ecp.internal.core.properties;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.core.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui",
+ org.eclipse.emf.ecp.internal.core.util.observer;version="1.13.0";x-friends:="org.eclipse.emf.ecp.core.rap",
+ org.eclipse.emf.ecp.spi.core;version="1.13.0",
+ org.eclipse.emf.ecp.spi.core.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/ecpProviderRegistry.xml,OSGI-INF/ecpRepositoryManager.xml,OSGI-INF/ecpProjectManager.xml,OSGI-INF/ecpObserverBus.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.core/pom.xml b/bundles/org.eclipse.emf.ecp.core/pom.xml
index d589293358..d8229cd2f3 100644
--- a/bundles/org.eclipse.emf.ecp.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.core</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF
index 1cc6289f5a..546bd1a1f9 100644
--- a/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Diagnostician
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.diagnostician.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diagnostician;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ui.validation.test",
- org.eclipse.emf.ecp.internal.diagnostician;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diagnostician;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ui.validation.test",
+ org.eclipse.emf.ecp.internal.diagnostician;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml b/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
index 0a9f0b070a..f4f9bd4260 100644
--- a/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation.diagnostician</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
index 963195c23c..9bd2662bdf 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Diff Merge Context
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.context
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.diffmerge.internal.context.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diffmerge.internal.context;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.diffmerge.spi.context;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.context;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.diffmerge.spi.context;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
index f880b2c604..21002791d3 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.context</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
index 8474c4dcf7..9d2d82cd48 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.spi.diffmerge.model.provider.DiffmergeEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml
index fc3eb629b7..39c259c554 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.model.edit</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
index 0b19ac2fc3..6d649c4e19 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.12.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.13.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
index 50f854183e..e58c77a0f1 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.model</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
index ab3be57c7d..76b36f9adf 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DiffMerge Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.renderer.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml
index 90740a3ac8..7db443e669 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.renderer.swt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF
index d69cff99bc..88e03930c7 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DiffMerge UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.swt
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.diffmerge.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.diffmerge.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.diffmerge.renderer.swt"
+Export-Package: org.eclipse.emf.ecp.diffmerge.swt;version="1.13.0";x-friends:="org.eclipse.emf.ecp.diffmerge.renderer.swt"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml
index 530a5fdae3..eacfe892dc 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.swt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.swt/src/org/eclipse/emf/ecp/diffmerge/swt/DiffDialog.java b/bundles/org.eclipse.emf.ecp.diffmerge.swt/src/org/eclipse/emf/ecp/diffmerge/swt/DiffDialog.java
index 1101c17de3..7ac478fb20 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.swt/src/org/eclipse/emf/ecp/diffmerge/swt/DiffDialog.java
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.swt/src/org/eclipse/emf/ecp/diffmerge/swt/DiffDialog.java
@@ -146,7 +146,7 @@ public class DiffDialog {
 				.applyTo(diffConfirmedComposite);
 			diffConfirmedComposite.setLayout(new FillLayout(SWT.HORIZONTAL));
 			final Button buttonDiffConfirmed = new Button(diffConfirmedComposite, SWT.CHECK);
-			buttonDiffConfirmed.setText(LocalizationServiceHelper.getString(getClass(),
+			buttonDiffConfirmed.setText(LocalizationServiceHelper.getString(DiffDialog.class,
 				MessageKeys.DiffDialog_DiffConfirmed));
 			buttonDiffConfirmed.setSelection(diffConfirmed);
 			buttonDiffConfirmed.addSelectionListener(new SelectionAdapter() {
@@ -175,7 +175,7 @@ public class DiffDialog {
 				.applyTo(nextPreviousComposite);
 
 			final Button previous = new Button(nextPreviousComposite, SWT.PUSH);
-			previous.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.DiffDialog_Previous));
+			previous.setText(LocalizationServiceHelper.getString(DiffDialog.class, MessageKeys.DiffDialog_Previous));
 			previous.setImage(Activator.getImage("icons/arrow_left.png")); //$NON-NLS-1$
 			GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).grab(false, false).applyTo(previous);
 			previous.addSelectionListener(new SelectionAdapter() {
@@ -194,7 +194,7 @@ public class DiffDialog {
 
 			});
 			final Button next = new Button(nextPreviousComposite, SWT.PUSH);
-			next.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.DiffDialog_Next));
+			next.setText(LocalizationServiceHelper.getString(DiffDialog.class, MessageKeys.DiffDialog_Next));
 			next.setImage(Activator.getImage("icons/arrow_right.png")); //$NON-NLS-1$
 			GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).grab(false, false).applyTo(next);
 			next.addSelectionListener(new SelectionAdapter() {
@@ -223,7 +223,7 @@ public class DiffDialog {
 
 		{
 			final Button bConfirm = new Button(buttonRowComposite, SWT.PUSH);
-			bConfirm.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.DiffDialog_Confirm));
+			bConfirm.setText(LocalizationServiceHelper.getString(DiffDialog.class, MessageKeys.DiffDialog_Confirm));
 			bConfirm.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_merge_confirm"); //$NON-NLS-1$
 			GridDataFactory.fillDefaults().align(SWT.END, SWT.BEGINNING).grab(true, false).applyTo(bConfirm);
 			bConfirm.addSelectionListener(new SelectionAdapter() {
@@ -254,12 +254,12 @@ public class DiffDialog {
 	private Control createTarget(final Composite parent) {
 		final Group targetGroup = new Group(parent, SWT.NONE);
 		targetGroup.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_target"); //$NON-NLS-1$
-		targetGroup.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.DiffDialog_targetObject));
+		targetGroup.setText(LocalizationServiceHelper.getString(DiffDialog.class, MessageKeys.DiffDialog_targetObject));
 		GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(false).applyTo(targetGroup);
 
 		// final Label mainObject = new Label(targetGroup, SWT.NONE);
 		// mainObject.setText(Messages.DiffDialog_targetObject);
-		//		mainObject.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_merge_label"); //$NON-NLS-1$
+		// mainObject.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_merge_label"); //$NON-NLS-1$
 		// GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.FILL).grab(false, false).applyTo(mainObject);
 
 		mergeControl = EcoreUtil.copy(main);
@@ -286,12 +286,13 @@ public class DiffDialog {
 	 */
 	private Control createDiff(final Composite parent) {
 		final Group group = new Group(parent, SWT.NONE);
-		group.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.DiffDialog_DifferenceGroup));
+		group.setText(LocalizationServiceHelper.getString(DiffDialog.class, MessageKeys.DiffDialog_DifferenceGroup));
 		group.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_diff"); //$NON-NLS-1$
 		GridLayoutFactory.fillDefaults().numColumns(2).equalWidth(false).applyTo(group);
 
 		final Label leftObject = new Label(group, SWT.NONE);
-		leftObject.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.DiffDialog_leftObject + ":")); //$NON-NLS-1$
+		leftObject
+			.setText(LocalizationServiceHelper.getString(DiffDialog.class, MessageKeys.DiffDialog_leftObject + ":")); //$NON-NLS-1$
 		leftObject.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_diff_left"); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.FILL).grab(false, false).span(2, 1).applyTo(leftObject);
 
@@ -299,7 +300,7 @@ public class DiffDialog {
 
 		final Button bReplaceWithLeft = new Button(group, SWT.PUSH);
 		bReplaceWithLeft.setText(LocalizationServiceHelper
-			.getString(getClass(), MessageKeys.DiffDialog_replaceWithLeft));
+			.getString(DiffDialog.class, MessageKeys.DiffDialog_replaceWithLeft));
 		bReplaceWithLeft.setImage(Activator.getImage("icons/arrow_down.png")); //$NON-NLS-1$
 		bReplaceWithLeft.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_diff_leftReplace"); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).grab(false, false).applyTo(bReplaceWithLeft);
@@ -319,7 +320,8 @@ public class DiffDialog {
 		});
 
 		final Label rightObject = new Label(group, SWT.NONE);
-		rightObject.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.DiffDialog_rightObject + ":")); //$NON-NLS-1$
+		rightObject
+			.setText(LocalizationServiceHelper.getString(DiffDialog.class, MessageKeys.DiffDialog_rightObject + ":")); //$NON-NLS-1$
 		rightObject.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_diff_right"); //$NON-NLS-1$
 		GridDataFactory.fillDefaults().align(SWT.BEGINNING, SWT.FILL).grab(false, false).span(2, 1)
 			.applyTo(rightObject);
@@ -327,7 +329,7 @@ public class DiffDialog {
 		createControl(group, EcoreUtil.copy(right), EcoreUtil.copy(viewModelContext.getRightModel()), true);
 
 		final Button bReplaceWithRight = new Button(group, SWT.PUSH);
-		bReplaceWithRight.setText(LocalizationServiceHelper.getString(getClass(),
+		bReplaceWithRight.setText(LocalizationServiceHelper.getString(DiffDialog.class,
 			MessageKeys.DiffDialog_replaceWithRight));
 		bReplaceWithRight.setImage(Activator.getImage("icons/arrow_down.png")); //$NON-NLS-1$
 		bReplaceWithLeft.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_compare_dialog_diff_rightReplace"); //$NON-NLS-1$
@@ -391,8 +393,7 @@ public class DiffDialog {
 		Collections.reverse(breadCrumb);
 		final StringBuilder sb = new StringBuilder();
 		for (final String bc : breadCrumb) {
-			if (sb.length() != 0)
-			{
+			if (sb.length() != 0) {
 				sb.append(">"); //$NON-NLS-1$
 			}
 			sb.append(bc);
diff --git a/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
index 6e8f39284f..f8f538041e 100644
--- a/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Doc
 Bundle-SymbolicName: org.eclipse.emf.ecp.doc;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Require-Bundle: org.eclipse.ui.intro;bundle-version="[3.4.0,4.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.doc/pom.xml b/bundles/org.eclipse.emf.ecp.doc/pom.xml
index 14b5fec812..45d81b62b4 100644
--- a/bundles/org.eclipse.emf.ecp.doc/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.doc/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.doc</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF
index 3fb76dc236..36f977ac6a 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECore GenModel Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.ui;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.ecore.editor.ui;version="1.2.0";x-internal:=true,
  org.eclipse.emf.ecp.ecore.editor.ui.operations;version="1.2.0";x-internal:=true
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.jface.text;bundle-version="[3.8.101,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.102.1,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.emf.ecore.presentation;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml
index bf235f7bbd..a0eb45c608 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor.ui</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF
index 1c7fb32a38..1eb7658c55 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP ECore Editor
 Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.ecore.editor;version="1.2.0";x-friends:="org.eclipse.emf.ecp.ecore.editor.test,org.eclipse.emf.ecp.ecore.editor.ui",
  org.eclipse.emf.ecp.ecore.editor.factory;version="1.2.0";x-friends:="org.eclipse.emf.ecp.ecore.editor.test,org.eclipse.emf.ecp.ecore.editor.ui",
diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml b/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml
index 8457001b20..617e66f6a7 100644
--- a/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ecore.editor/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF
index 3b138aec23..fb672b72b5 100644
--- a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: ECP Editor controls for Ecore Elements
+Bundle-Name: ECP Editor controls for Ecore Elements (Deprecated)
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.ecore.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml
index 1b7a567aaf..6b7651dad0 100644
--- a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit.ecore.swt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/.classpath b/bundles/org.eclipse.emf.ecp.edit.swt/.classpath
index ad32c83a78..098194ca4b 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/.classpath
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters
index dcc4566e4d..fddc81f050 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters
@@ -105,5 +105,11 @@
                 <message_argument value="getTargetToModelStrategy()"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI change" id="576720909">
+            <message_arguments>
+                <message_argument value="StringBasedCellEditor"/>
+                <message_argument value="StringCellEditor"/>
+            </message_arguments>
+        </filter>
     </resource>
 </component>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.jdt.core.prefs
index 26d14e4fb8..827ebc947c 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable

 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

+org.eclipse.jdt.core.compiler.compliance=1.7

 org.eclipse.jdt.core.compiler.debug.lineNumber=generate

 org.eclipse.jdt.core.compiler.debug.localVariable=generate

 org.eclipse.jdt.core.compiler.debug.sourceFile=generate

@@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore

 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.6

+org.eclipse.jdt.core.compiler.source=1.7

 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled

 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL

 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO

diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
index 07f8d971bb..afb7b38ea9 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.edit.internal.swt.Activator
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
- org.eclipse.emf.ecp.edit.internal.swt.actions;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.edit.ecore.swt",
- org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,org.eclipse.emf.ecp.view.core.swt",
+ org.eclipse.emf.ecp.edit.internal.swt.actions;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.edit.ecore.swt",
+ org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.ui.view.swt,
    org.eclipse.emf.ecp.ui.view.editor.controls,
    org.eclipse.emf.ecp.view.table.ui.swt,
    org.eclipse.emf.ecp.view.core.swt",
- org.eclipse.emf.ecp.edit.internal.swt.reference;version="1.12.0";x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.edit.internal.swt.table;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt,org.eclipse.emfforms.swt.control.multiattribute",
- org.eclipse.emf.ecp.edit.internal.swt.util;version="1.12.0";
+ org.eclipse.emf.ecp.edit.internal.swt.reference;version="1.13.0";x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.edit.internal.swt.table;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt,org.eclipse.emfforms.swt.control.multiattribute",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.editor,
    org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.ui.view.swt,
@@ -24,26 +24,27 @@ Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.12.0";x-friends
    org.eclipse.emf.ecp.view.table.ui.swt,
    org.eclipse.emf.ecp.view.categorization.swt,
    org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,
-   org.eclipse.emf.ecp.view.core.swt",
- org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.12.0",
- org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.12.0",
- org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.12.0",
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.12.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="1.12.0"
+   org.eclipse.emf.ecp.view.core.swt,
+   org.eclipse.emfforms.swt.control.multiattribute",
+ org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.13.0",
+ org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.13.0",
+ org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.13.0",
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.13.0",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.databinding.fieldassist;version="0.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
index 4741141809..42de510eca 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit.swt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
index 967d603868..eeceb86fe8 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecp.edit.internal.swt.Activator;
 import org.eclipse.emf.ecp.edit.internal.swt.controls.NumericalHelper;
 import org.eclipse.emf.ecp.edit.spi.ViewLocaleService;
-import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;
 import org.eclipse.emf.ecp.edit.spi.swt.util.ECPDialogExecutor;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.edit.command.SetCommand;
@@ -35,7 +34,6 @@ import org.eclipse.jface.databinding.viewers.CellEditorProperties;
 import org.eclipse.jface.dialogs.IDialogLabelKeys;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -47,7 +45,7 @@ import org.eclipse.swt.widgets.Text;
  * @author Eugen Neufeld
  *
  */
-public class NumberCellEditor extends TextCellEditor implements ECPCellEditor {
+public class NumberCellEditor extends StringBasedCellEditor {
 
 	/**
 	 * @author Jonas
@@ -163,7 +161,6 @@ public class NumberCellEditor extends TextCellEditor implements ECPCellEditor {
 	}
 
 	private EStructuralFeature eStructuralFeature;
-	private ViewModelContext viewModelContext;
 	@Deprecated
 	private ViewLocaleService localeService;
 	private EMFFormsLocaleProvider localeProvider;
@@ -208,7 +205,6 @@ public class NumberCellEditor extends TextCellEditor implements ECPCellEditor {
 	@Override
 	public void instantiate(EStructuralFeature eStructuralFeature, ViewModelContext viewModelContext) {
 		this.eStructuralFeature = eStructuralFeature;
-		this.viewModelContext = viewModelContext;
 		getControl().setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_edit_cellEditor_numberical"); //$NON-NLS-1$
 		localeService = viewModelContext.getService(ViewLocaleService.class);
 		localeProvider = viewModelContext.getService(EMFFormsLocaleProvider.class);
@@ -223,7 +219,7 @@ public class NumberCellEditor extends TextCellEditor implements ECPCellEditor {
 	@Override
 	public String getFormatedString(Object value) {
 		if (value == null) {
-			setErrorMessage(LocalizationServiceHelper.getString(getClass(),
+			setErrorMessage(LocalizationServiceHelper.getString(NumberCellEditor.class,
 				TableMessageKeys.NumberCellEditor_ValueIsNull));
 			return ""; //$NON-NLS-1$
 		}
@@ -267,7 +263,7 @@ public class NumberCellEditor extends TextCellEditor implements ECPCellEditor {
 	 */
 	@Override
 	public UpdateValueStrategy getTargetToModelStrategy(final DataBindingContext databindingContext) {
-		return new TargetToModelStrategy(databindingContext);
+		return withPreSetValidation(eStructuralFeature, new TargetToModelStrategy(databindingContext));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/StringBasedCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/StringBasedCellEditor.java
new file mode 100644
index 0000000000..b7cc5f1e8d
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/StringBasedCellEditor.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.internal.swt.table;
+
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;
+import org.eclipse.emf.ecp.edit.spi.swt.util.PreSetValidationStrategy;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Cell editor for string based cell editors that implements a custom
+ * activate method that propagates changes on first key stroke.
+ *
+ */
+public abstract class StringBasedCellEditor extends TextCellEditor implements ECPCellEditor {
+
+	private String initialValue;
+
+	/**
+	 * Default constructor.
+	 */
+	public StringBasedCellEditor() {
+		super();
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent the parent {@link Composite}
+	 */
+	public StringBasedCellEditor(Composite parent) {
+		super(parent);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent the parent {@link Composite}
+	 * @param style SWT styling bits
+	 */
+	public StringBasedCellEditor(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#activate(org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent)
+	 */
+	@Override
+	public void activate(ColumnViewerEditorActivationEvent event) {
+		initialValue = text.getText();
+		if (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED
+			&& isPrintable(event.character)
+			&& (getStyle() & SWT.READ_ONLY) == 0) {
+
+			doSetValue(String.valueOf(event.character));
+		}
+		super.activate(event);
+	}
+
+	@Override
+	protected void fireCancelEditor() {
+		if (text != null && !text.isDisposed()
+			&& text.getText() != null
+			&& !text.getText().equals(initialValue)) {
+			doSetValue(initialValue);
+		}
+		super.fireCancelEditor();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.TextCellEditor#doSetFocus()
+	 */
+	@Override
+	protected void doSetFocus() {
+		super.doSetFocus();
+		if (text.getText() != null) {
+			text.setSelection(text.getText().length());
+		}
+	}
+
+	/**
+	 * Create a {@link PreSetValidationStrategy}.
+	 *
+	 * @param feature the feature the cell editor is bound against
+	 * @param delegate a delegate {@link UpdateValueStrategy}
+	 *
+	 * @return a {@link PreSetValidationStrategy}
+	 *
+	 */
+	protected UpdateValueStrategy withPreSetValidation(EStructuralFeature feature, UpdateValueStrategy delegate) {
+		return new PreSetValidationStrategy(null, feature, delegate);
+	}
+
+	/**
+	 * Determines whether the given character is printable.
+	 * Mimics behavior of Nebula's LetterOrDigitKeyEventMatcher.
+	 *
+	 *
+	 * @param character the character to be checked
+	 * @return {@code true}, if the character can be printed, {@code false} otherwise
+	 */
+	protected boolean isPrintable(char character) {
+		return Character.isLetterOrDigit(character)
+			|| Character
+				.valueOf(character)
+				.toString()
+				.matches("[\\.:,;\\-_#\'+*~!?§$%&/()\\[\\]\\{\\}=\\\\\"]"); //$NON-NLS-1$
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java
index a080c97e15..5474eacb8d 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java
@@ -1,149 +1,157 @@
-/*******************************************************************************

- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Eugen Neufeld - initial API and implementation

- ******************************************************************************/

-package org.eclipse.emf.ecp.edit.internal.swt.util;

-

-import java.lang.reflect.Constructor;

-import java.lang.reflect.InvocationTargetException;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecp.edit.internal.swt.Activator;

-import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;

-import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorTester;

-import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;

-import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Table;

-import org.osgi.framework.Bundle;

-

-public final class CellEditorFactory {

-	private static final String CONTROL_EXTENSION = "org.eclipse.emf.ecp.edit.swt.cellEditor"; //$NON-NLS-1$

-

-	private static final String CLASS_ATTRIBUTE = "class";//$NON-NLS-1$

-	private static final String ID = "id";//$NON-NLS-1$

-	private static final String TESTER = "tester";//$NON-NLS-1$

-

-	private final Set<CellDescriptor> descriptors = new HashSet<CellEditorFactory.CellDescriptor>();

-

-	public static final CellEditorFactory INSTANCE = new CellEditorFactory();

-

-	private CellEditorFactory() {

-		parseExtensionPoint();

-	}

-

-	private void parseExtensionPoint() {

-		final IConfigurationElement[] controls = Platform.getExtensionRegistry().getConfigurationElementsFor(

-			CONTROL_EXTENSION);

-		for (final IConfigurationElement e : controls) {

-			try {

-				final String id = e.getAttribute(ID);

-				final String clazz = e.getAttribute(CLASS_ATTRIBUTE);

-				final Class<? extends CellEditor> resolvedClass = loadClass(e.getContributor().getName(), clazz);

-				final ECPCellEditorTester tester = (ECPCellEditorTester) e.createExecutableExtension(TESTER);

-				descriptors.add(new CellDescriptor(id, resolvedClass, tester));

-			} catch (final ClassNotFoundException e1) {

-				Activator.logException(e1);

-			} catch (final CoreException e1) {

-				Activator.logException(e1);

-			}

-		}

-	}

-

-	@SuppressWarnings("unchecked")

-	private static <T> Class<T> loadClass(String bundleName, String clazz) throws ClassNotFoundException {

-		final Bundle bundle = Platform.getBundle(bundleName);

-		if (bundle == null) {

-			throw new ClassNotFoundException(clazz

-				+ LocalizationServiceHelper.getString(CellEditorFactory.class,

-					UtilMessageKeys.CellEditorFactory_CannotBeLoadedBecauseBundle)

-				+ bundleName

-				+ LocalizationServiceHelper.getString(CellEditorFactory.class,

-					UtilMessageKeys.CellEditorFactory_CannotBeResolved));

-		}

-		return (Class<T>) bundle.loadClass(clazz);

-

-	}

-

-	public CellEditor getCellEditor(EStructuralFeature eStructuralFeature, EObject eObject, Table table,

-		ViewModelContext viewModelContext) {

-		int bestPriority = -1;

-		CellDescriptor bestCandidate = null;

-		for (final CellDescriptor descriptor : descriptors) {

-			final int priority = descriptor.getTester().isApplicable(eObject, eStructuralFeature, viewModelContext);

-			if (priority > bestPriority) {

-				bestCandidate = descriptor;

-				bestPriority = priority;

-			}

-		}

-		CellEditor result = null;

-		if (bestCandidate != null) {

-			try {

-				final Constructor<? extends CellEditor> constructor = bestCandidate.getCellEditorClass()

-					.getConstructor(

-						Composite.class);

-				result = constructor.newInstance(table);

-				final ECPCellEditor ecpCellEditor = (ECPCellEditor) result;

-				ecpCellEditor.instantiate(eStructuralFeature, viewModelContext);

-			} catch (final SecurityException e) {

-				Activator.logException(e);

-			} catch (final NoSuchMethodException e) {

-				Activator.logException(e);

-			} catch (final IllegalArgumentException e) {

-				Activator.logException(e);

-			} catch (final InstantiationException e) {

-				Activator.logException(e);

-			} catch (final IllegalAccessException e) {

-				Activator.logException(e);

-			} catch (final InvocationTargetException e) {

-				Activator.logException(e);

-			} catch (final ClassCastException e) {

-				Activator.logException(e);

-			}

-		}

-		if (result == null) {

-			result = new TextCellEditor(table);

-		}

-		return result;

-	}

-

-	private class CellDescriptor {

-		private final String id;

-		private final Class<? extends CellEditor> cellEditorClass;

-		private final ECPCellEditorTester tester;

-

-		CellDescriptor(String id, Class<? extends CellEditor> cellEditorClass, ECPCellEditorTester tester) {

-			super();

-			this.id = id;

-			this.cellEditorClass = cellEditorClass;

-			this.tester = tester;

-		}

-

-		String getId() {

-			return id;

-		}

-

-		Class<? extends CellEditor> getCellEditorClass() {

-			return cellEditorClass;

-		}

-

-		ECPCellEditorTester getTester() {

-			return tester;

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.internal.swt.util;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.internal.swt.Activator;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorTester;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
+import org.osgi.framework.Bundle;
+
+public final class CellEditorFactory {
+	private static final String CONTROL_EXTENSION = "org.eclipse.emf.ecp.edit.swt.cellEditor"; //$NON-NLS-1$
+
+	private static final String CLASS_ATTRIBUTE = "class";//$NON-NLS-1$
+	private static final String ID = "id";//$NON-NLS-1$
+	private static final String TESTER = "tester";//$NON-NLS-1$
+
+	private final Set<CellDescriptor> descriptors = new HashSet<CellEditorFactory.CellDescriptor>();
+
+	public static final CellEditorFactory INSTANCE = new CellEditorFactory();
+
+	private CellEditorFactory() {
+		parseExtensionPoint();
+	}
+
+	private void parseExtensionPoint() {
+		final IConfigurationElement[] controls = Platform.getExtensionRegistry().getConfigurationElementsFor(
+			CONTROL_EXTENSION);
+		for (final IConfigurationElement e : controls) {
+			try {
+				final String id = e.getAttribute(ID);
+				final String clazz = e.getAttribute(CLASS_ATTRIBUTE);
+				final Class<? extends CellEditor> resolvedClass = loadClass(e.getContributor().getName(), clazz);
+				final ECPCellEditorTester tester = (ECPCellEditorTester) e.createExecutableExtension(TESTER);
+				descriptors.add(new CellDescriptor(id, resolvedClass, tester));
+			} catch (final ClassNotFoundException e1) {
+				Activator.logException(e1);
+			} catch (final CoreException e1) {
+				Activator.logException(e1);
+			}
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private static <T> Class<T> loadClass(String bundleName, String clazz) throws ClassNotFoundException {
+		final Bundle bundle = Platform.getBundle(bundleName);
+		if (bundle == null) {
+			throw new ClassNotFoundException(clazz
+				+ LocalizationServiceHelper.getString(CellEditorFactory.class,
+					UtilMessageKeys.CellEditorFactory_CannotBeLoadedBecauseBundle)
+				+ bundleName
+				+ LocalizationServiceHelper.getString(CellEditorFactory.class,
+					UtilMessageKeys.CellEditorFactory_CannotBeResolved));
+		}
+		return (Class<T>) bundle.loadClass(clazz);
+
+	}
+
+	public CellEditor getCellEditor(EStructuralFeature eStructuralFeature, EObject eObject, Table table,
+		ViewModelContext viewModelContext) {
+		int bestPriority = -1;
+		CellDescriptor bestCandidate = null;
+		for (final CellDescriptor descriptor : descriptors) {
+			final int priority = descriptor.getTester().isApplicable(eObject, eStructuralFeature, viewModelContext);
+			if (priority > bestPriority) {
+				bestCandidate = descriptor;
+				bestPriority = priority;
+			}
+		}
+		CellEditor result = null;
+		if (bestCandidate != null) {
+			try {
+				final Constructor<? extends CellEditor> constructor = bestCandidate.getCellEditorClass()
+					.getConstructor(
+						Composite.class);
+				result = constructor.newInstance(table);
+				final ECPCellEditor ecpCellEditor = (ECPCellEditor) result;
+				ecpCellEditor.instantiate(eStructuralFeature, viewModelContext);
+			} catch (final SecurityException e) {
+				Activator.logException(e);
+			} catch (final NoSuchMethodException e) {
+				Activator.logException(e);
+			} catch (final IllegalArgumentException e) {
+				Activator.logException(e);
+			} catch (final InstantiationException e) {
+				Activator.logException(e);
+			} catch (final IllegalAccessException e) {
+				Activator.logException(e);
+			} catch (final InvocationTargetException e) {
+				Activator.logException(e);
+			} catch (final ClassCastException e) {
+				Activator.logException(e);
+			}
+		}
+		if (result == null) {
+			result = new TextCellEditor(table);
+		}
+
+		if (Text.class.isInstance(result.getControl())) {
+			PreSetValidationListeners.create().verify(
+				Text.class.cast(result.getControl()),
+				eStructuralFeature);
+		}
+
+		return result;
+	}
+
+	private class CellDescriptor {
+		private final String id;
+		private final Class<? extends CellEditor> cellEditorClass;
+		private final ECPCellEditorTester tester;
+
+		CellDescriptor(String id, Class<? extends CellEditor> cellEditorClass, ECPCellEditorTester tester) {
+			super();
+			this.id = id;
+			this.cellEditorClass = cellEditorClass;
+			this.tester = tester;
+		}
+
+		String getId() {
+			return id;
+		}
+
+		Class<? extends CellEditor> getCellEditorClass() {
+			return cellEditorClass;
+		}
+
+		ECPCellEditorTester getTester() {
+			return tester;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/DateUtil.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/DateUtil.java
index 215d7d1961..8774480536 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/DateUtil.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/DateUtil.java
@@ -50,4 +50,24 @@ public final class DateUtil {
 		return cal;
 	}
 
+	/**
+	 * Convert a {@link Calendar} object to an {@link XMLGregorianCalendar} (to the {@link XMLCalendar} implementation).
+	 *
+	 * @param calendar the {@link Calendar} to convert
+	 * @return the {@link XMLGregorianCalendar}
+	 */
+	public static XMLGregorianCalendar convertCalendarToXMLGregorianCalendar(Calendar calendar) {
+		final XMLGregorianCalendar cal = new XMLCalendar(calendar.getTime(), XMLCalendar.DATETIME);
+
+		cal.setYear(calendar.get(Calendar.YEAR));
+		cal.setMonth(calendar.get(Calendar.MONTH) + 1);
+		cal.setDay(calendar.get(Calendar.DAY_OF_MONTH));
+		cal.setTimezone(calendar.get(Calendar.ZONE_OFFSET / 6000));
+		cal.setHour(calendar.get(Calendar.HOUR_OF_DAY));
+		cal.setMinute(calendar.get(Calendar.MINUTE));
+		cal.setSecond(calendar.get(Calendar.SECOND));
+		cal.setMillisecond(calendar.get(Calendar.MILLISECOND));
+		return cal;
+	}
+
 }
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/PreSetValidationListeners.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/PreSetValidationListeners.java
new file mode 100644
index 0000000000..7d018a2df9
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/PreSetValidationListeners.java
@@ -0,0 +1,306 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.internal.swt.util;
+
+import java.text.MessageFormat;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xml.type.InvalidDatatypeValueException;
+import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emfforms.spi.common.validation.PreSetValidationService;
+import org.eclipse.emfforms.spi.common.validation.PreSetValidationServiceRunnable;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Text;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Utility class for setting up a {@link VerifyListener}
+ * that performs pre-set validation.
+ *
+ */
+public final class PreSetValidationListeners {
+
+	/**
+	 * Singleton instance.
+	 */
+	private static PreSetValidationListeners validationListeners = new PreSetValidationListeners();
+	private static PreSetValidationService preSetValidationService;
+
+	private PreSetValidationListeners() {
+		init();
+	}
+
+	/**
+	 * Returns the validation listeners factory.
+	 *
+	 * @return the factory that can be used to create and attach listeners
+	 */
+	public static PreSetValidationListeners create() {
+		return validationListeners;
+	}
+
+	private void init() {
+		if (preSetValidationService == null) {
+			final BundleContext bundleContext = FrameworkUtil
+				.getBundle(getClass())
+				.getBundleContext();
+
+			final ServiceReference<PreSetValidationService> serviceReference = bundleContext
+				.getServiceReference(PreSetValidationService.class);
+
+			preSetValidationService = serviceReference != null
+				? bundleContext.getService(serviceReference) : null;
+		}
+	}
+
+	/**
+	 * Attach a {@link VerifyListener} to the given {@link Text} widget.
+	 * Performs pre-set validation for the given {@link EStructuralFeature}
+	 *
+	 * @param text the text widget the created verify listener should be attached to
+	 * @param feature the feature to be validated
+	 */
+	public void verify(Text text, final EStructuralFeature feature) {
+		verify(text, feature, null);
+	}
+
+	/**
+	 * Attach a {@link VerifyListener} to the given {@link Combo} widget.
+	 * Performs pre-set validation for the given {@link EStructuralFeature}
+	 *
+	 * @param combo the combo widget the created verify listener should be attached to
+	 * @param feature the feature to be validated
+	 */
+	public void verify(Combo combo, final EStructuralFeature feature) {
+		verify(combo, feature, null);
+	}
+
+	/**
+	 * Attach a {@link VerifyListener} to the given {@link Text} widget.
+	 * Performs pre-set validation for the given {@link EStructuralFeature} and reports any
+	 * errors to the given {@link VElement}.
+	 *
+	 * @param text the text widget the created verify listener should be attached to
+	 * @param feature the feature to be validated
+	 * @param vElement the {@link VElement} an {@link Diagnostic} may be attached to
+	 */
+	public void verify(Text text, final EStructuralFeature feature, final VElement vElement) {
+
+		if (!EAttribute.class.isInstance(feature)) {
+			// this shouldn't happen as we expect only EDataTypes
+			return;
+		}
+
+		final EAttribute attribute = (EAttribute) feature;
+
+		if (preSetValidationService != null) {
+			final VerifyListener verifyListener = new PreSetVerifyListener(vElement, attribute);
+			text.addVerifyListener(verifyListener);
+		}
+	}
+
+	/**
+	 * Attach a {@link VerifyListener} to the given {@link Combo} widget.
+	 * Performs pre-set validation for the given {@link EStructuralFeature} and reports any
+	 * errors to the given {@link VElement}.
+	 *
+	 * @param combo the combo widget the created verify listener should be attached to
+	 * @param feature the feature to be validated
+	 * @param vElement the {@link VElement} an {@link Diagnostic} may be attached to
+	 */
+	public void verify(Combo combo, final EStructuralFeature feature, final VElement vElement) {
+
+		if (!EAttribute.class.isInstance(feature)) {
+			// this shouldn't happen as we expect only EDataTypes
+			return;
+		}
+
+		final EAttribute attribute = (EAttribute) feature;
+
+		if (preSetValidationService != null) {
+			final VerifyListener verifyListener = new PreSetVerifyListener(vElement, attribute);
+			combo.addVerifyListener(verifyListener);
+		}
+	}
+
+	/**
+	 * Validate a given feature value strictly based on the defined constraints.
+	 *
+	 * @param feature the feature to validate
+	 * @param value the value to validate
+	 * @return the resulting {@link VDiagnostic}
+	 */
+	protected VDiagnostic validateStrict(EStructuralFeature feature, Object value) {
+		final Diagnostic strictDiag = preSetValidationService.validate(feature, value);
+		final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+		if (strictDiag.getSeverity() != Diagnostic.OK) {
+			vDiagnostic.getDiagnostics().add(strictDiag);
+			return vDiagnostic;
+		}
+		if (feature.isRequired()) {
+			/* value must not be empty, which is not an EDataType-Constraint */
+			if (value == null || isString(feature.getEType()) && "".equals(value)) { //$NON-NLS-1$
+				final BasicDiagnostic multiplicityDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "", //$NON-NLS-1$
+					EObjectValidator.EOBJECT__EVERY_MULTIPCITY_CONFORMS,
+					MessageFormat.format("The required feature ''{0}'' must be set", feature.getName()), //$NON-NLS-1$
+					new Object[0]);
+				vDiagnostic.getDiagnostics().add(multiplicityDiagnostic);
+				return vDiagnostic;
+			}
+		}
+		return null;
+	}
+
+	private boolean isString(EClassifier classifier) {
+		return classifier.getInstanceTypeName().equals(String.class.getCanonicalName());
+	}
+
+	/**
+	 * Attach a {@link FocusListener} to the given {@link Text} widget.
+	 * Performs pre-set validation for the given {@link EStructuralFeature} and
+	 * executes the {@link Runnable} in case the content of the text widget is
+	 * invalid.
+	 *
+	 * @param text the text widget the created verify listener should be attached to
+	 * @param feature the feature to be validated
+	 * @param focusLost code to be executed in case the text is invalid and focus has been lost
+	 * @param focusGained code to be executed in case the focus has been gained
+	 */
+	public void focus(final Text text, final EStructuralFeature feature,
+		final PreSetValidationServiceRunnable focusLost,
+		final Runnable focusGained) {
+		if (preSetValidationService != null) {
+			text.addFocusListener(new FocusListener() {
+				@Override
+				public void focusLost(FocusEvent e) {
+					focusLost.run(preSetValidationService);
+				}
+
+				@Override
+				public void focusGained(FocusEvent e) {
+					focusGained.run();
+				}
+			});
+		}
+	}
+
+	/**
+	 * Default VerifyListener implementation.
+	 *
+	 */
+	public static class PreSetVerifyListener implements VerifyListener {
+
+		private final EAttribute attribute;
+		private final VElement vElement;
+
+		/**
+		 * Constructor.
+		 *
+		 * @param vElement the {@link VElement} any {@link VDiagnostic} will be attached to
+		 * @param attribute the {@link EAttribute} to be validated
+		 */
+		public PreSetVerifyListener(VElement vElement, EAttribute attribute) {
+			this.vElement = vElement;
+			this.attribute = attribute;
+		}
+
+		@Override
+		/**
+		 *
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.swt.events.VerifyListener#verifyText(org.eclipse.swt.events.VerifyEvent)
+		 */
+		public void verifyText(VerifyEvent e) {
+			final String changedText = obtainText(e);
+
+			Object changedValue;
+			try {
+				changedValue = EcoreUtil.createFromString(attribute.getEAttributeType(), changedText);
+			} catch (final IllegalArgumentException | InvalidDatatypeValueException formatException) {
+				if (isInteger(attribute.getEType()) && changedText.isEmpty()
+					|| XMLGregorianCalendar.class.isAssignableFrom(attribute.getEType().getInstanceClass())
+					|| double.class.isAssignableFrom(attribute.getEType().getInstanceClass())
+					|| Double.class.isAssignableFrom(attribute.getEType().getInstanceClass())) {
+
+					// TODO: corner case, let change propagate in case of integer
+					return;
+				}
+
+				e.doit = false;
+				return;
+			}
+
+			final VDiagnostic prevDiagnostic = vElement == null ? null : vElement.getDiagnostic();
+			if (vElement != null) {
+				vElement.setDiagnostic(validationListeners.validateStrict(attribute, changedValue));
+			}
+
+			final Diagnostic looseDiag = preSetValidationService.validateLoose(attribute,
+				changedValue);
+			if (looseDiag.getSeverity() == Diagnostic.OK) {
+				// loose validation successfully, but keep nevertheless keep validation diagnostic
+				return;
+			}
+
+			// loose validation not successfully, revert and restore previous diagnostic, if any
+			// TODO: revert only for strings because of un-intuitive behavior for integers
+			if (validationListeners.isString(attribute.getEType())) {
+				// remove diagnostic once again, since we revert the change
+				e.doit = false;
+				if (vElement != null) {
+					vElement.setDiagnostic(prevDiagnostic);
+				}
+
+			}
+		}
+
+		/**
+		 * Obtain the text value of the widget.
+		 *
+		 * @param event the event
+		 * @return the current text value
+		 */
+		protected String obtainText(VerifyEvent event) {
+			String currentText = ""; //$NON-NLS-1$
+			if (event.widget instanceof Text) {
+				currentText = Text.class.cast(event.widget).getText();
+			} else if (event.widget instanceof Combo) {
+				currentText = Combo.class.cast(event.widget).getText();
+			}
+			final String changedText = currentText.substring(0, event.start) + event.text
+				+ currentText.substring(event.end);
+			return changedText;
+		}
+
+		private boolean isInteger(EClassifier classifier) {
+			return classifier.getInstanceTypeName().equals(Integer.class.getCanonicalName());
+		}
+
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/reference/NewReferenceAction.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/reference/NewReferenceAction.java
index 088350104a..f04336f0c8 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/reference/NewReferenceAction.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/reference/NewReferenceAction.java
@@ -123,7 +123,7 @@ public class NewReferenceAction extends ECPSWTAction {
 		} else if (attribute.endsWith("s")) {//$NON-NLS-1$
 			attribute = attribute.substring(0, attribute.length() - 1);
 		}
-		setToolTipText(LocalizationServiceHelper.getString(getClass(),
+		setToolTipText(LocalizationServiceHelper.getString(NewReferenceAction.class,
 			ReferenceMessageKeys.NewReferenceAction_CreateAndLinkNew)
 			+ attribute);
 	}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPEnumCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPEnumCellEditor.java
new file mode 100644
index 0000000000..4e4ffd8c4e
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPEnumCellEditor.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.ecp.edit.spi.swt.table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Common base class for combo-based enum cell editors.
+ *
+ * @since 1.13
+ */
+public abstract class ECPEnumCellEditor extends CellEditor implements ECPCellEditor {
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent the parent {@link Composite}
+	 */
+	public ECPEnumCellEditor(Composite parent) {
+		super(parent);
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param parent the parent {@link Composite}
+	 * @param style SWT style bits
+	 */
+	public ECPEnumCellEditor(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	/**
+	 * Returns the {@link EEnum} is cell editor responsible for.
+	 *
+	 * @return the enum
+	 */
+	public abstract EEnum getEEnum();
+
+	/**
+	 * Returns the list of literals of the enum.
+	 *
+	 * @return a list of literals
+	 *
+	 * @see #getEEnum
+	 */
+	public List<EEnumLiteral> getELiterals() {
+		final List<EEnumLiteral> filtered = new ArrayList<EEnumLiteral>();
+		final EList<EEnumLiteral> eLiterals = getEEnum().getELiterals();
+		for (final EEnumLiteral literal : eLiterals) {
+
+			final String isInputtable = EcoreUtil.getAnnotation(literal,
+				VViewPackage.eNS_URI,
+				"isInputtable"); //$NON-NLS-1$
+
+			if (isInputtable == null || Boolean.getBoolean(isInputtable)) {
+				filtered.add(literal);
+			}
+		}
+		return filtered;
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java
index f912be2a18..58c546898d 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/StringCellEditor.java
@@ -15,10 +15,10 @@ import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.internal.swt.table.StringBasedCellEditor;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.CellEditorProperties;
-import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
@@ -30,12 +30,15 @@ import org.eclipse.swt.widgets.Composite;
  * @since 1.5
  *
  */
-public class StringCellEditor extends TextCellEditor implements ECPCellEditor {
+public class StringCellEditor extends StringBasedCellEditor {
+
+	private EStructuralFeature eStructuralFeature;
 
 	/**
 	 * Default constructor.
 	 */
 	public StringCellEditor() {
+		super();
 	}
 
 	/**
@@ -75,8 +78,7 @@ public class StringCellEditor extends TextCellEditor implements ECPCellEditor {
 	 */
 	@Override
 	public void instantiate(EStructuralFeature feature, ViewModelContext viewModelContext) {
-		// TODO Auto-generated method stub
-
+		eStructuralFeature = feature;
 	}
 
 	/**
@@ -113,8 +115,7 @@ public class StringCellEditor extends TextCellEditor implements ECPCellEditor {
 	 */
 	@Override
 	public UpdateValueStrategy getTargetToModelStrategy(DataBindingContext databindingContext) {
-		// TODO Auto-generated method stub
-		return null;
+		return withPreSetValidation(eStructuralFeature, new UpdateValueStrategy());
 	}
 
 	/**
@@ -126,7 +127,6 @@ public class StringCellEditor extends TextCellEditor implements ECPCellEditor {
 	 */
 	@Override
 	public UpdateValueStrategy getModelToTargetStrategy(DataBindingContext databindingContext) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/util/PreSetValidationStrategy.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/util/PreSetValidationStrategy.java
new file mode 100644
index 0000000000..afb42cfd11
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/util/PreSetValidationStrategy.java
@@ -0,0 +1,203 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.spi.swt.util;
+
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.conversion.IConverter;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.emfforms.spi.common.validation.PreSetValidationService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * A common {@link EMFUpdateValueStrategy} that implements {@link #validateBeforeSet(Object)}.
+ *
+ * @since 1.13
+ */
+public class PreSetValidationStrategy extends UpdateValueStrategy {
+
+	private final EStructuralFeature eStructuralFeature;
+	private final VElement vElement;
+	private final UpdateValueStrategy strategy;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param vElement the {@link VElement}
+	 * @param eStructuralFeature an {@link EStructuralFeature} that defines any validation constraints
+	 * @param delegate the strategy to delegate to
+	 */
+	public PreSetValidationStrategy(VElement vElement, EStructuralFeature eStructuralFeature,
+		UpdateValueStrategy delegate) {
+		this.vElement = vElement;
+		this.eStructuralFeature = eStructuralFeature;
+		strategy = delegate;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#validateBeforeSet(java.lang.Object)
+	 */
+	@Override
+	public IStatus validateBeforeSet(Object value) {
+		final BundleContext bundleContext = FrameworkUtil
+			.getBundle(getClass())
+			.getBundleContext();
+		final ServiceReference<PreSetValidationService> serviceReference = bundleContext
+			.getServiceReference(PreSetValidationService.class);
+
+		if (serviceReference == null) {
+			return strategy.validateBeforeSet(value);
+		}
+
+		if (eStructuralFeature.isUnsettable() && SetCommand.UNSET_VALUE == value) {
+			/* we are dealing with an unsettable feature and the unset value */
+			/* we need to validate the default value instead of the unset value */
+			value = eStructuralFeature.getDefaultValue();
+		}
+
+		try {
+
+			final PreSetValidationService service = bundleContext.getService(serviceReference);
+
+			if (service == null) {
+				return strategy.validateBeforeSet(value);
+			}
+
+			final Diagnostic result = service.validate(eStructuralFeature, value);
+
+			if (result.getSeverity() == Diagnostic.OK) {
+				return Status.OK_STATUS;
+			}
+
+			// TODO: existing diagnostics?
+			final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+			vDiagnostic.getDiagnostics().add(result);
+			if (vElement != null) {
+				vElement.setDiagnostic(vDiagnostic);
+			}
+			return BasicDiagnostic.toIStatus(result);
+		} finally {
+			bundleContext.ungetService(serviceReference);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#convert(java.lang.Object)
+	 */
+	@Override
+	public Object convert(Object value) {
+		return strategy.convert(value);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#getUpdatePolicy()
+	 */
+	@Override
+	public int getUpdatePolicy() {
+		return strategy.getUpdatePolicy();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#setAfterConvertValidator(org.eclipse.core.databinding.validation.IValidator)
+	 */
+	@Override
+	public UpdateValueStrategy setAfterConvertValidator(IValidator validator) {
+		return strategy.setAfterConvertValidator(validator);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#setBeforeSetValidator(org.eclipse.core.databinding.validation.IValidator)
+	 */
+	@Override
+	public UpdateValueStrategy setBeforeSetValidator(IValidator validator) {
+		return strategy.setBeforeSetValidator(validator);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#setAfterGetValidator(org.eclipse.core.databinding.validation.IValidator)
+	 */
+	@Override
+	public UpdateValueStrategy setAfterGetValidator(IValidator validator) {
+		return strategy.setAfterGetValidator(validator);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#setConverter(org.eclipse.core.databinding.conversion.IConverter)
+	 */
+	@Override
+	public UpdateValueStrategy setConverter(IConverter converter) {
+		return strategy.setConverter(converter);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#validateAfterConvert(java.lang.Object)
+	 */
+	@Override
+	public IStatus validateAfterConvert(Object value) {
+		return strategy.validateAfterConvert(value);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.core.databinding.UpdateValueStrategy#validateAfterGet(java.lang.Object)
+	 */
+	@Override
+	public IStatus validateAfterGet(Object value) {
+		return strategy.validateAfterGet(value);
+	}
+
+	/**
+	 * Returns the {@link EStructuralFeature} that defines any validation constraints.
+	 *
+	 * @return the structural feature
+	 */
+	public EStructuralFeature getStructuralFeature() {
+		return eStructuralFeature;
+	}
+
+	/**
+	 * Returns the associated {@link VElement}.
+	 *
+	 * @return the {@link VElement}
+	 */
+	public VElement getVElement() {
+		return vElement;
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
index 95f63116e5..37bb5e80cc 100644
--- a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.edit.Activator
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emf.ecp.edit.spi;version="1.12.0",
- org.eclipse.emf.ecp.edit.spi.util;version="1.12.0",
- org.eclipse.emf.ecp.internal.edit;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.spi;version="1.13.0",
+ org.eclipse.emf.ecp.edit.spi.util;version="1.13.0",
+ org.eclipse.emf.ecp.internal.edit;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.6.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/ecpControlFactory.xml,OSGI-INF/org.eclipse.emf.ecp.internal.edit.DeleteServiceFactoryImpl.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/org.eclipse.emf.ecp.edit/pom.xml b/bundles/org.eclipse.emf.ecp.edit/pom.xml
index f4227c47be..87855d8956 100644
--- a/bundles/org.eclipse.emf.ecp.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.edit</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
index af1f7efc1e..2bc74b83bf 100644
--- a/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Editor integration for 3.x Workbench
 Bundle-SymbolicName: org.eclipse.emf.ecp.editor.e3;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.editor.internal.e3.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.editor.e3;version="1.12.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.editor.internal.e3;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.editor.e3;version="1.13.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.editor.internal.e3;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml b/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
index 73a6d14478..9d248e49cb 100644
--- a/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.editor.e3</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
index a0cb2c6234..868dfc4b66 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
@@ -11,12 +11,12 @@ Export-Package: org.eclipse.emf.ecp.emf2web.json.controller;version="1.0.0",
 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.xtend.lib;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.xtend.lib.macro;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
index a43765e9ee..cd205a50c2 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
index 0db7f45c99..9d619cfa8a 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
@@ -9,13 +9,13 @@ Export-Package: org.eclipse.emf.ecp.emf2web.ui.json;version="1.0.0";x-internal:=
  org.eclipse.emf.ecp.emf2web.ui.json.internal.handler;version="1.0.0";x-internal:=true,
  org.eclipse.emf.ecp.emf2web.ui.json.internal.messages;version="1.0.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.emf.ecp.emf2web.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecp.emf2web.ui;bundle-version="[1.0.0,1.1.0)",
  org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
index c28ac6d2fc..a64099eb9e 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/src/org/eclipse/emf/ecp/emf2web/ui/json/internal/handler/ExportJSONFormsHandler.java b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/src/org/eclipse/emf/ecp/emf2web/ui/json/internal/handler/ExportJSONFormsHandler.java
index ab00f26c37..344b0cd638 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/src/org/eclipse/emf/ecp/emf2web/ui/json/internal/handler/ExportJSONFormsHandler.java
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/src/org/eclipse/emf/ecp/emf2web/ui/json/internal/handler/ExportJSONFormsHandler.java
@@ -34,7 +34,7 @@ import org.eclipse.emf.ecp.emf2web.json.controller.JsonGenerationController;
 import org.eclipse.emf.ecp.emf2web.ui.handler.AbstractSchemaExportCommandHandler;
 import org.eclipse.emf.ecp.emf2web.ui.json.Activator;
 import org.eclipse.emf.ecp.emf2web.ui.json.internal.messages.Messages;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -44,7 +44,6 @@ import org.eclipse.ui.handlers.HandlerUtil;
 /**
  * The handler responsible for exporting view models to JSONForms.
  */
-@SuppressWarnings("restriction")
 public class ExportJSONFormsHandler extends AbstractSchemaExportCommandHandler {
 
 	private final List<String> registeredEcores = new LinkedList<String>();
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
index 4b752bccf9..b271a1920c 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.emf2web.ui.handler;version="1.0.0",
  org.eclipse.emf.ecp.emf2web.ui.messages;version="1.0.0";x-internal:=true,
  org.eclipse.emf.ecp.emf2web.ui.wizard;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)",
  org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.5.0,2.0.0)",
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.common;bundle-version="[3.7.0,4.0.0)",
  com.ibm.icu;bundle-version="[54.1.0,60.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
index 534f41066a..e625134420 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
index a10b90bee3..09f8b8357a 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
@@ -25,24 +25,24 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.13.0,1.14.0)",
  com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.common.model;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
index 437fe6a0c7..9bb01af0f6 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
index 1e4ebe0cd2..a33e2d25e3 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore Core RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core.rap
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.core.rap.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.internal.core.rap;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.core.rap;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.rap.rwt;version="0.0.0",
  org.eclipse.rap.rwt.service;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml
index 0a377cd95d..b6e15f36f4 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.core.rap</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
index 6ab4290f46..302298ccba 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore Provider Core Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.core.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.emfstore.ui,
    org.eclipse.emf.ecp.emfstore.ui.search,
    org.eclipse.emf.ecp.view.ui.editor.test,
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.12.0";
    org.eclipse.emf.ecp.emfstore.ui.e4,
    org.eclipse.emf.ecp.emfstore.core.rap"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
index 99155fccfd..ef369d8fa0 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.core</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF
index 8a672a26a5..b382317e23 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore E3
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.e3;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.ui.e3.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui.decorator;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.12.0";x-internal:=true;uses:="org.eclipse.core.commands"
-Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui.decorator;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.13.0";x-internal:=true;uses:="org.eclipse.core.commands"
+Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.emfstore.client.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml
index 4bec99ae63..aa6a773d56 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui.e3</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
index ffb3c14c98..24bb5db003 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Emfstore e4 ui
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.e4;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.e4.emfstore.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.e4.core.di;bundle-version="[1.2.0,2.0.0)",
  javax.inject;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.emf.emfstore.client.ui;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.swt;bundle-version="[3.100.0,4.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml
index cf7a2948c5..c50e2a5397 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui.e4</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF
index 0804e2134e..8bbe531f04 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Search UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.search;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.e3;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml
index f4dc8a90ba..b9662aece6 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui.search</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
index 9beafdb565..8048cdb073 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP EMFStore UI Provider
 Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.12.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui.e4,org.eclipse.emf.ecp.emfstore.ui.e3",
- org.eclipse.emf.ecp.emfstore.internal.ui.observer;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.13.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui.e4,org.eclipse.emf.ecp.emfstore.ui.e3",
+ org.eclipse.emf.ecp.emfstore.internal.ui.observer;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.emfstore.client.ui;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.jface.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
index 76a2ab1686..2ca300e495 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.ui</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
index d6c4013f1c..f7be730cbf 100644
--- a/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI Contributions for the Bowling example model
 Bundle-SymbolicName: org.eclipse.emf.ecp.examplemodel.ui;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml b/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
index 06cd24720f..66e255caad 100644
--- a/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.examplemodel.ui</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
index 370bc8b5fe..66d8135cfb 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Explorer Editor Bridge
 Bundle-SymbolicName: org.eclipse.emf.ecp.explorereditorbridge;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.explorereditorbridge.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.test"
+Export-Package: org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.view.test"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.editor.e3;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.editor.e3;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.internal.swt;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.internal.swt;version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml b/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
index dd235ea024..0f98f81d49 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.explorereditorbridge</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
index 02b52cbd28..3af487b227 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.1.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
- org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)"
+ org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.7.0,1.8.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
index 7e11a5f35d..744562bc71 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Editor to Template Editor Integration
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view.templatebridge;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml
index 362bd45c26..ba10d03f07 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.editor.view.templatebridge</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
index 62a21fe0d6..bb72845727 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
@@ -2,25 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE View Editor
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.editor.view.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
- org.eclipse.emf.ecp.ide.editor.view.messages;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
+ org.eclipse.emf.ecp.ide.editor.view.messages;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui.ide;bundle-version="[3.9.1,4.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.jface;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml
index b845ffd21f..7df1f3387f 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.editor.view</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java
index 137d415b9d..a517e26e3e 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java
@@ -16,9 +16,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.EventObject;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -39,15 +37,14 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xml.type.AnyType;
 import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
 import org.eclipse.emf.ecp.ide.editor.view.messages.Messages;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.eclipse.emf.ecp.ide.view.service.ViewModelEditorCallback;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
 import org.eclipse.emf.ecp.ui.view.ECPRendererException;
 import org.eclipse.emf.ecp.ui.view.swt.DefaultReferenceService;
 import org.eclipse.emf.ecp.ui.view.swt.ECPSWTView;
@@ -63,6 +60,7 @@ import org.eclipse.emf.ecp.view.spi.model.reporting.StatusReport;
 import org.eclipse.emf.ecp.view.spi.provider.ViewProviderHelper;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.ui.util.EditUIUtil;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -79,6 +77,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPartReference;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 import org.eclipse.ui.dialogs.ISelectionStatusValidator;
 import org.eclipse.ui.dialogs.ListSelectionDialog;
@@ -104,6 +103,7 @@ public class ViewEditorPart extends EditorPart implements
 	private boolean ecoreOutOfSync;
 	private IPartListener2 partListener;
 	private final ViewEditorPart instance;
+	private AdapterFactoryEditingDomain editingDomain;
 
 	/** Default constructor for {@link ViewEditorPart}. */
 	public ViewEditorPart() {
@@ -113,18 +113,35 @@ public class ViewEditorPart extends EditorPart implements
 
 	@Override
 	public void doSave(IProgressMonitor monitor) {
+		// Do the work within an operation because this is a long running activity that modifies the workbench.
+		final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				try {
+					resource.save(null);
+				} catch (final IOException e) {
+					Activator.getDefault().getLog()
+						.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
+				}
+			}
+		};
 		try {
-			resource.save(null);
+			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
 			basicCommandStack.saveIsDone();
 			firePropertyChange(IEditorPart.PROP_DIRTY);
-		} catch (final IOException e) {
-			Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
+		} catch (final InvocationTargetException e) {
+			Activator.getDefault().getLog()
+				.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
+		} catch (final InterruptedException e) {
+			Activator.getDefault().getLog()
+				.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
 		}
+
 	}
 
 	@Override
 	public void doSaveAs() {
-
+		// unsupported
 	}
 
 	@Override
@@ -136,6 +153,13 @@ public class ViewEditorPart extends EditorPart implements
 
 		try {
 			basicCommandStack = new BasicCommandStack();
+			editingDomain = new AdapterFactoryEditingDomain(
+				new ComposedAdapterFactory(new AdapterFactory[] {
+					new CustomReflectiveItemProviderAdapterFactory(),
+					new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE) }),
+				basicCommandStack);
+			editingDomain.getResourceSet().getLoadOptions().put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE,
+				Boolean.TRUE);
 			loadView(false, false);
 		} // BEGIN SUPRESS CATCH EXCEPTION
 		catch (final Exception e) {// END SUPRESS CATCH EXCEPTION
@@ -178,19 +202,6 @@ public class ViewEditorPart extends EditorPart implements
 		ResourcesPlugin.getWorkspace().addResourceChangeListener(listener);
 	}
 
-	private ResourceSet createResourceSet() {
-		final ResourceSet resourceSet = new ResourceSetImpl();
-
-		final AdapterFactoryEditingDomain domain = new AdapterFactoryEditingDomain(
-			new ComposedAdapterFactory(new AdapterFactory[] {
-				new CustomReflectiveItemProviderAdapterFactory(),
-				new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE) }),
-			basicCommandStack, resourceSet);
-		resourceSet.eAdapters().add(
-			new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
-		return resourceSet;
-	}
-
 	@Override
 	public boolean isDirty() {
 		return basicCommandStack.isSaveNeeded();
@@ -209,25 +220,19 @@ public class ViewEditorPart extends EditorPart implements
 	 * @throws PartInitException
 	 */
 	private void loadView(boolean migrate, boolean resolve) throws IOException, PartInitException {
-		final FileEditorInput fei = (FileEditorInput) getEditorInput();
-
-		final ResourceSet resourceSet = createResourceSet();
-		final URI resourceURI = URI.createURI(fei.getURI().toURL().toExternalForm());
 
+		// resourceURI must be a platform resource URI
+		final URI resourceURI = EditUIUtil.getURI(getEditorInput(), editingDomain.getResourceSet().getURIConverter());
 		if (migrate) {
 			checkMigration(resourceURI);
 		}
-
-		final Map<Object, Object> loadOptions = new HashMap<Object, Object>();
-		loadOptions
-			.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-		resource = resourceSet.createResource(resourceURI);
-		resource.load(loadOptions);
+		resource = editingDomain.getResourceSet().getResource(resourceURI, true);
 		if (resource.getContents().size() == 0 || !VView.class.isInstance(resource.getContents().get(0))) {
 			throw new PartInitException(Messages.ViewEditorPart_InvalidVView);
 		}
 		if (resolve) {
 			// resolve all proxies
+			final ResourceSet resourceSet = editingDomain.getResourceSet();
 			int rsSize = resourceSet.getResources().size();
 			EcoreUtil.resolveAll(resourceSet);
 			while (rsSize != resourceSet.getResources().size()) {
@@ -386,9 +391,6 @@ public class ViewEditorPart extends EditorPart implements
 		EcoreHelper.registerEcore(ecorePath);
 	}
 
-	/**
-	 * @param view
-	 */
 	private void saveChangedView(VView view) {
 		try {
 			view.eResource().save(null);
@@ -465,7 +467,7 @@ public class ViewEditorPart extends EditorPart implements
 	 */
 	@Override
 	public void reloadViewModel() {
-		Display.getDefault().asyncExec(new ReladViewModelRunnable());
+		Display.getDefault().asyncExec(new ReloadViewModelRunnable());
 	}
 
 	@Override
@@ -557,7 +559,7 @@ public class ViewEditorPart extends EditorPart implements
 	 * @author Jonas
 	 *
 	 */
-	private final class ReladViewModelRunnable implements Runnable {
+	private final class ReloadViewModelRunnable implements Runnable {
 		@Override
 		public void run() {
 			if (parent == null || parent.isDisposed()) {
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
index 0912b3b9b7..87673fc86f 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Viewmodel
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.viewmodel;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml
index b13ea6b2d6..d0e3b04a60 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.editor.viewmodel</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/viewmodel/group.view b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/viewmodel/group.view
index dca252868d..6623f3a18c 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/viewmodel/group.view
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/viewmodel/group.view
@@ -11,6 +11,11 @@
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://org/eclipse/emf/ecp/view/model/170#//Element/readonly"/>
     </domainModelReference>
   </children>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_OwTEgP0JEea0gu9ZCWtkiA" name="tooltip">
+  	<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mfPL2UWAEeWfKJaajyNdyA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://org/eclipse/emf/ecp/view/group/model#//Group/tooltip"/>
+    </domainModelReference>
+  </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_mfPLlEWAEeWfKJaajyNdyA" name="Control groupType">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_mfPLlUWAEeWfKJaajyNdyA">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://org/eclipse/emf/ecp/view/group/model#//Group/groupType"/>
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF
index 6b26606a4c..2d2dd64602 100644
--- a/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.util/META-INF/MANIFEST.MF
@@ -2,21 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Ecore Helper Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util;singleton:=true
-Bundle-Version: 1.12.0.qualifier
-Bundle-Activator: org.eclipse.emf.ecp.ide.util.Activator
+Bundle-Version: 1.13.0.qualifier
+Bundle-Activator: org.eclipse.emf.ecp.ide.internal.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ide.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.ecore.ui,
-   org.eclipse.emf.ecp.ide.editor.view,
-   org.eclipse.emf.ecp.ide.view.service,
-   org.eclipse.emf.ecp.ide.util.test,
-   org.eclipse.emf.ecp.view.model.editor"
+Export-Package: org.eclipse.emf.ecp.ide.internal;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ide.spi.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/pom.xml b/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
index 4057011a72..82431b000f 100644
--- a/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.util</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/util/Activator.java b/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/internal/Activator.java
index 8deed6f8b2..7a7bff74fd 100644
--- a/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/util/Activator.java
+++ b/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/internal/Activator.java
@@ -10,7 +10,7 @@
  * Alexandra Buzila - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.emf.ecp.ide.util;
+package org.eclipse.emf.ecp.ide.internal;
 
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.emfforms.spi.common.report.AbstractReport;
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/internal/ide/util/EcoreHelper.java b/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/spi/util/EcoreHelper.java
index ff8d61a6d6..e8c4a6fadc 100644
--- a/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/internal/ide/util/EcoreHelper.java
+++ b/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/spi/util/EcoreHelper.java
@@ -10,7 +10,7 @@
  * Alexandra Buzila - initial API and implementation
  * Johannes Faltermeier - refactorings
  ******************************************************************************/
-package org.eclipse.emf.ecp.internal.ide.util;
+package org.eclipse.emf.ecp.ide.spi.util;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -29,12 +29,13 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecp.ide.util.Activator;
+import org.eclipse.emf.ecp.ide.internal.Activator;
 
 /**
  * Helper methods for dealing with ecores.
  *
  * @author Alexandra Buzila
+ * @since 1.13
  *
  */
 public final class EcoreHelper {
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/internal/ide/util/ViewModelHelper.java b/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/spi/util/ViewModelHelper.java
index 35eb6d8494..38c12f78de 100644
--- a/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/internal/ide/util/ViewModelHelper.java
+++ b/bundles/org.eclipse.emf.ecp.ide.util/src/org/eclipse/emf/ecp/ide/spi/util/ViewModelHelper.java
@@ -9,7 +9,7 @@
  * Contributors:
  * Alexandra Buzila - initial API and implementation
  ******************************************************************************/
-package org.eclipse.emf.ecp.internal.ide.util;
+package org.eclipse.emf.ecp.ide.spi.util;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -31,10 +31,12 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 
 /**
+ * Helper class for view model objects.
+ * 
  * @author Alexandra Buzila
  *
+ * @since 1.13
  */
-/** Helper class for view model objects. */
 public final class ViewModelHelper {
 
 	private ViewModelHelper() {
@@ -91,8 +93,7 @@ public final class ViewModelHelper {
 		} else {
 			ep = null;
 		}
-		if (ep == null && selectedEcore != null)
-		{
+		if (ep == null && selectedEcore != null) {
 			EcoreHelper.registerEcore(selectedEcore.getFullPath().toString());
 			ep = (EPackage) instance.get(ePackage.getNsURI());
 		}
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF
index 812b7acfe0..41518555cf 100644
--- a/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.view.service/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDE ViewModel Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.view.service.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.internal.service;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ide.view.service;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.ide.view.internal.service;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ide.view.service;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.ide.editor.view,
    org.eclipse.emf.ecp.ui.view.editor.controls,
    org.eclipse.emf.ecp.view.model.editor,
    org.eclipse.emf.ecp.view.model.project.installer"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/ideviewmdoelregistry.xml
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml b/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml
index 17301cb388..0ad2808e9b 100644
--- a/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ide.view.service</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java b/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java
index d11570d93a..bc2ffc05e5 100644
--- a/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.ide.view.service/src/org/eclipse/emf/ecp/ide/view/internal/service/IDEViewModelRegistryImpl.java
@@ -22,9 +22,9 @@ import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.eclipse.emf.ecp.ide.view.service.IDEViewModelRegistry;
 import org.eclipse.emf.ecp.ide.view.service.ViewModelEditorCallback;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 
 /**
diff --git a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
index abc94e9e85..d16b7bd05a 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Quickfix UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.ui.e4;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.12.0";x-friends:="org.eclipse.emf.ecp.application.e4"
-Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="[1.1.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.13.0";x-friends:="org.eclipse.emf.ecp.application.e4"
+Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="[1.1.0,3.0.0)",
  org.eclipse.e4.ui.di;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[1.0.2,2.0.0)",
- org.eclipse.emf.ecp.quickfix;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.quickfix;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.7.0,4.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml
index 0069926f65..8e75f33935 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.quickfix.ui.e4/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF
index d268161b44..25282203d6 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.quickfix/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Quickfix Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix;version="1.12.0",
- org.eclipse.emf.ecp.quickfix.internal;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.quickfix;version="1.13.0",
+ org.eclipse.emf.ecp.quickfix.internal;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.quickfix/pom.xml b/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
index d744054217..d3dd8ea2bf 100644
--- a/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF
index aac1964561..06fe0c04df 100644
--- a/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.rap.util/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RAP Util
 Bundle-SymbolicName: org.eclipse.emf.ecp.rap.util;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.window;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.rap.util/pom.xml b/bundles/org.eclipse.emf.ecp.rap.util/pom.xml
index d491dddca3..8a5809ea26 100644
--- a/bundles/org.eclipse.emf.ecp.rap.util/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.rap.util/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.util</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
index 5b77841d8d..6b4c82231f 100644
--- a/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.rap;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.rap.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.rap;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.rap.ui;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.rap/pom.xml b/bundles/org.eclipse.emf.ecp.rap/pom.xml
index d079a41c26..f135d3a6bb 100644
--- a/bundles/org.eclipse.emf.ecp.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF
index a1abba52fb..b4e07e9248 100644
--- a/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.test.common/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Test Helpers
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.common
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.test.common;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.test.common;version="1.13.0"
 Require-Bundle: org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.test.common/pom.xml b/bundles/org.eclipse.emf.ecp.test.common/pom.xml
index 224157a777..f924889bec 100644
--- a/bundles/org.eclipse.emf.ecp.test.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.test.common/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF
index 21fa6a05e4..0d2c703a95 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Eclipse 3.x Integration
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e3;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ui.platform.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emf.ecp.ui.actions;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.commands;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e3;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.linkedView;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.perspective;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.platform;version="1.12.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
- org.eclipse.emf.ecp.ui.tester;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.views;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.actions;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.commands;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e3;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.linkedView;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.perspective;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.platform;version="1.13.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.ecp.ui.tester;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.views;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)"
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
  org.eclipse.jface.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
index d947cd3831..d8ddc43162 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.e3</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
index 6cb4d7c99b..f843c18e92 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP E4 UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e4;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ui.internal.e4.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.e4.editor;version="1.12.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.handlers;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e4.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.view;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.internal.e4;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.e4.editor;version="1.13.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.handlers;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e4.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.view;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.internal.e4;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,3.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.ui.workbench.swt;bundle-version="[0.10.0,1.0.0)",
  javax.inject;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.ui.di;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.services;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.annotation;version="1.1.0",
  javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.osgi.service.event;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
index 79f6ad92af..c1c93508ca 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.e4</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF
index fef90f990d..5c4a161467 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI RWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.rap
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.rap.filedialog;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.rap.rwt;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.osgi.service.component.annotations;version="[1.0.0,2.0.0)"
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
index c84754c4eb..8a68a5aab1 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.rap</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF
index 39aafaed18..299ba3d1f3 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.rcp
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.swt;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.osgi.service.component.annotations;version="[1.0.0,2.0.0)"
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
index 2a34a4619f..8c367b80cd 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.rcp</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF
index 0afd2d92e6..67810671a4 100644
--- a/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Transactional UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.transaction;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml b/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
index 3a58734875..ed89ff1880 100644
--- a/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.transaction</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF
index cc2d871c7b..0dd8684ed9 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.validation.e4/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI Validation E4
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.e4;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.validation.e4.view;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.validation.e4.view;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.e4.ui.workbench.swt;bundle-version="[0.10.0,1.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.ui.di;bundle-version="[0.10.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.9.1,4.0.0)",
- org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[0.1.0,2.0.0)",
- org.eclipse.e4.ui.model.workbench;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.e4.ui.model.workbench;bundle-version="[1.0.1,3.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.500,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.annotation;version="1.1.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml b/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml
index 1bc3edcc4a..9e306e357b 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.validation.e4/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.validation.e4</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
index 15569a147b..692a6ee074 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation View
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.ui.validation.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.validation;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4",
- org.eclipse.emf.ecp.ui.validation;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
+Export-Package: org.eclipse.emf.ecp.internal.ui.validation;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4",
+ org.eclipse.emf.ecp.ui.validation;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml b/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
index 8492d43d26..362170e396 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui.validation</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
index 19c971c21c..c6c804fbfd 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
@@ -2,41 +2,52 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Controls
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.editor.controls.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.editor.controls;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer,org.eclipse.emf.ecp.view.model.editor,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
- org.eclipse.emf.ecp.view.spi.editor.controls;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.editor.controls;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer,org.eclipse.emf.ecp.view.model.editor,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/ControlRootEClassControl2SWTRendererService.xml,OSGI-INF/ControlRootEClassControlChangeableSWTRendererService.xml,OSGI-INF/DomainModelReferenceControlSWTRendererService.xml,OSGI-INF/LeafConditionControlRendererService.xml,OSGI-INF/LinkFeatureControlRendererService.xml,OSGI-INF/StackItemControlRendererService.xml,OSGI-INF/TableColumnsDMRTableControlService.xml,OSGI-INF/TableDetailViewControlSWTRendererService.xml
+Service-Component: OSGI-INF/ControlRootEClassControl2SWTRendererService.xml,
+ OSGI-INF/ControlRootEClassControlChangeableSWTRendererService.xml,
+ OSGI-INF/DomainModelReferenceControlSWTRendererService.xml,
+ OSGI-INF/LeafConditionControlRendererService.xml,
+ OSGI-INF/LinkFeatureControlRendererService.xml,
+ OSGI-INF/StackItemControlRendererService.xml,
+ OSGI-INF/TableColumnsDMRTableControlService.xml,
+ OSGI-INF/TableDetailViewControlSWTRendererService.xml,
+ OSGI-INF/TableWidthConfigurationDMRRendererService.xml,
+ OSGI-INF/ColumnEnablementConfigurationDMRRendererService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/OSGI-INF/ColumnEnablementConfigurationDMRRendererService.xml b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/OSGI-INF/ColumnEnablementConfigurationDMRRendererService.xml
new file mode 100644
index 0000000000..94b0ad00fa
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/OSGI-INF/ColumnEnablementConfigurationDMRRendererService.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ColumnEnablementConfigurationDMRRendererService">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+   </service>
+   <reference bind="setEMFFormsDatabindingEMF" cardinality="1..1" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" name="EMFFormsDatabindingEMF" policy="static"/>
+   <reference bind="setreportService" cardinality="1..1" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="reportService" policy="static"/>
+   <implementation class="org.eclipse.emf.ecp.view.internal.editor.controls.ColumnEnablementConfigurationDMRRendererService"/>
+</scr:component>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/OSGI-INF/TableWidthConfigurationDMRRendererService.xml b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/OSGI-INF/TableWidthConfigurationDMRRendererService.xml
new file mode 100644
index 0000000000..9551c7fb37
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/OSGI-INF/TableWidthConfigurationDMRRendererService.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="TableWidthConfigurationDMRRendererService">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+   </service>
+   <reference bind="setEMFFormsDatabindingEMF" cardinality="1..1" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" name="EMFFormsDatabindingEMF" policy="static"/>
+   <reference bind="setreportService" cardinality="1..1" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="reportService" policy="static"/>
+   <implementation class="org.eclipse.emf.ecp.view.internal.editor.controls.TableWidthConfigurationDMRRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml
index 405d0a5fba..4868686b99 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnConfigurationDMRRendererReferenceService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnConfigurationDMRRendererReferenceService.java
new file mode 100644
index 0000000000..559101f730
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnConfigurationDMRRendererReferenceService.java
@@ -0,0 +1,108 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.editor.controls;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecp.edit.spi.ReferenceService;
+import org.eclipse.emf.ecp.spi.common.ui.SelectModelElementWizardFactory;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+
+/**
+ * Special {@link ReferenceService} allowing stream lined DMR selection for the width configuration.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public class ColumnConfigurationDMRRendererReferenceService implements ReferenceService {
+
+	private final Class<? extends VSingleColumnConfiguration> columnConfigClass;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param columnConfigClass the {@link VSingleColumnConfiguration} based class to be filtered
+	 */
+	public ColumnConfigurationDMRRendererReferenceService(
+		Class<? extends VSingleColumnConfiguration> columnConfigClass) {
+		this.columnConfigClass = columnConfigClass;
+	}
+
+	@Override
+	public void instantiate(ViewModelContext context) {
+		/* no-op */
+	}
+
+	@Override
+	public void dispose() {
+		/* no-op */
+	}
+
+	@Override
+	public int getPriority() {
+		/* no-op */
+		return 0;
+	}
+
+	@Override
+	public void addNewModelElements(EObject eObject, EReference eReference) {
+		/* no-op */
+	}
+
+	@SuppressWarnings("restriction")
+	@Override
+	public void addExistingModelElements(EObject eObject, EReference eReference) {
+		if (!VTableControl.class.isInstance(eObject.eContainer())) {
+			return;
+		}
+		final VTableControl tableControl = VTableControl.class.cast(eObject.eContainer());
+		if (!VTableDomainModelReference.class.isInstance(tableControl.getDomainModelReference())) {
+			return;
+		}
+		final VTableDomainModelReference tableDMR = VTableDomainModelReference.class
+			.cast(tableControl.getDomainModelReference());
+		final Set<EObject> unconfiguredColumns = new LinkedHashSet<EObject>(
+			tableDMR.getColumnDomainModelReferences());
+		for (final VTableColumnConfiguration columnConfiguration : tableControl.getColumnConfigurations()) {
+			if (!columnConfigClass.isInstance(columnConfiguration)) {
+				continue;
+			}
+			unconfiguredColumns
+				.remove(columnConfigClass.cast(columnConfiguration).getColumnDomainReference());
+		}
+
+		final Set<EObject> selectedColumns = SelectModelElementWizardFactory
+			.openModelElementSelectionDialog(
+				unconfiguredColumns,
+				eReference.isMany());
+
+		org.eclipse.emf.ecp.internal.edit.ECPControlHelper.addModelElementsInReference(
+			eObject,
+			selectedColumns,
+			eReference,
+			AdapterFactoryEditingDomain.getEditingDomainFor(eObject));
+	}
+
+	@Override
+	public void openInNewContext(EObject eObject) {
+		/* no-op */
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnEnablementConfigurationDMRRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnEnablementConfigurationDMRRenderer.java
new file mode 100644
index 0000000000..a4ee9458df
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnEnablementConfigurationDMRRenderer.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.editor.controls;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.ecp.edit.spi.ReferenceService;
+import org.eclipse.emf.ecp.view.internal.core.swt.renderer.LinkControlSWTRenderer;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
+import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Special {@link LinkControlSWTRenderer} which will streamline the column dmr selection.
+ *
+ * @author Edgar Mueller
+ *
+ */
+public class ColumnEnablementConfigurationDMRRenderer extends LinkControlSWTRenderer {
+
+	private ColumnConfigurationDMRRendererReferenceService referenceService;
+
+	/**
+	 * @param vElement the element to render
+	 * @param viewContext the view model context
+	 * @param reportService the report service
+	 * @param emfFormsDatabinding the data binding service
+	 * @param emfFormsLabelProvider the label provider
+	 * @param vtViewTemplateProvider the view template provider
+	 * @param localizationService the localization service
+	 * @param imageRegistryService the image registry service
+	 * @param emfFormsEditSuppport the edit support
+	 */
+	@Inject
+	// CHECKSTYLE.OFF: ParameterNumber
+	public ColumnEnablementConfigurationDMRRenderer(
+		VControl vElement,
+		ViewModelContext viewContext,
+		ReportService reportService,
+		EMFFormsDatabinding emfFormsDatabinding,
+		EMFFormsLabelProvider emfFormsLabelProvider,
+		VTViewTemplateProvider vtViewTemplateProvider,
+		EMFFormsLocalizationService localizationService,
+		ImageRegistryService imageRegistryService,
+		EMFFormsEditSupport emfFormsEditSuppport) {
+		// CHECKSTYLE.ON: ParameterNumber
+		super(
+			vElement,
+			viewContext,
+			reportService,
+			emfFormsDatabinding,
+			emfFormsLabelProvider,
+			vtViewTemplateProvider,
+			localizationService,
+			imageRegistryService,
+			emfFormsEditSuppport);
+	}
+
+	@Override
+	protected void createNewReferenceButton(Composite parent, String elementDisplayName) {
+		/* we only want users to select existing DMRs -> no-op */
+	}
+
+	@Override
+	protected ReferenceService getReferenceService() {
+		if (referenceService == null) {
+			referenceService = new ColumnConfigurationDMRRendererReferenceService(VEnablementConfiguration.class);
+		}
+		return referenceService;
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnEnablementConfigurationDMRRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnEnablementConfigurationDMRRendererService.java
new file mode 100644
index 0000000000..bb53755ce0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ColumnEnablementConfigurationDMRRendererService.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.editor.controls;
+
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+
+/**
+ * {@link EMFFormsDIRendererService} for configuring the enabled state of column.
+ *
+ * @author Edgar Mueller
+ *
+ */
+@Component(name = "ColumnEnablementConfigurationDMRRendererService", service = EMFFormsDIRendererService.class)
+public class ColumnEnablementConfigurationDMRRendererService implements EMFFormsDIRendererService<VControl> {
+
+	private EMFFormsDatabindingEMF databinding;
+	private ReportService reportService;
+
+	/**
+	 * @param databinding {@link EMFFormsDatabindingEMF}
+	 */
+	@Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
+	public void setEMFFormsDatabindingEMF(EMFFormsDatabindingEMF databinding) {
+		this.databinding = databinding;
+	}
+
+	/**
+	 * @param reportService {@link ReportService}
+	 */
+	@Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
+	public void setreportService(ReportService reportService) {
+		this.reportService = reportService;
+	}
+
+	@Override
+	public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+		if (!VControl.class.isInstance(vElement)) {
+			return NOT_APPLICABLE;
+		}
+		final VDomainModelReference domainModelReference = VControl.class.cast(vElement).getDomainModelReference();
+		if (domainModelReference == null) {
+			return NOT_APPLICABLE;
+		}
+		try {
+			final IEMFValueProperty valueProperty = databinding.getValueProperty(
+				domainModelReference,
+				viewModelContext.getDomainModel());
+
+			if (viewModelContext.getDomainModel() instanceof VEnablementConfiguration
+				&& valueProperty.getStructuralFeature() == VTablePackage.eINSTANCE
+					.getSingleColumnConfiguration_ColumnDomainReference()) {
+				return 3d;
+			}
+		} catch (final DatabindingFailedException ex) {
+			reportService.report(new AbstractReport(ex));
+		}
+
+		return NOT_APPLICABLE;
+	}
+
+	@Override
+	public Class<? extends AbstractSWTRenderer<VControl>> getRendererClass() {
+		return ColumnEnablementConfigurationDMRRenderer.class;
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java
index b1bdd49153..4e264f1fed 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRenderer.java
@@ -85,27 +85,28 @@ public class ControlRootEClassControl2SWTRenderer extends SimpleControlSWTContro
 		final Binding[] bindings = new Binding[3];
 		final IObservableValue value = WidgetProperties.text().observe(label);
 
-		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(), new UpdateValueStrategy() {
+		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy() {
 
-			@Override
-			public Object convert(Object value) {
-				try {
-					return getModelValue().getValue();
-				} catch (final DatabindingFailedException ex) {
-					getReportService().report(new DatabindingFailedReport(ex));
-					return null;
+				@Override
+				public Object convert(Object value) {
+					try {
+						return getModelValue().getValue();
+					} catch (final DatabindingFailedException ex) {
+						getReportService().report(new DatabindingFailedReport(ex));
+						return null;
+					}
 				}
-			}
-		}, new UpdateValueStrategy() {
-			@Override
-			public Object convert(Object value) {
-				updateChangeListener((EObject) value);
-				return getText(value);
-			}
-		});
+			}), new UpdateValueStrategy() {
+				@Override
+				public Object convert(Object value) {
+					updateChangeListener((EObject) value);
+					return getText(value);
+				}
+			});
 		final IObservableValue tooltipValue = WidgetProperties.tooltipText().observe(label);
 		bindings[1] = getDataBindingContext().bindValue(tooltipValue, getModelValue(),
-			new UpdateValueStrategy() {
+			withPreSetValidation(new UpdateValueStrategy() {
 
 				@Override
 				public Object convert(Object value) {
@@ -116,7 +117,7 @@ public class ControlRootEClassControl2SWTRenderer extends SimpleControlSWTContro
 						return null;
 					}
 				}
-			}, new UpdateValueStrategy() {
+			}), new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
 					return getText(value);
@@ -124,23 +125,24 @@ public class ControlRootEClassControl2SWTRenderer extends SimpleControlSWTContro
 			});
 
 		final IObservableValue imageValue = WidgetProperties.image().observe(imageLabel);
-		bindings[2] = getDataBindingContext().bindValue(imageValue, getModelValue(), new UpdateValueStrategy() {
+		bindings[2] = getDataBindingContext().bindValue(imageValue, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy() {
 
-			@Override
-			public Object convert(Object value) {
-				try {
-					return getModelValue().getValue();
-				} catch (final DatabindingFailedException ex) {
-					Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
-					return null;
+				@Override
+				public Object convert(Object value) {
+					try {
+						return getModelValue().getValue();
+					} catch (final DatabindingFailedException ex) {
+						Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+						return null;
+					}
 				}
-			}
-		}, new UpdateValueStrategy() {
-			@Override
-			public Object convert(Object value) {
-				return getImage(value);
-			}
-		});
+			}), new UpdateValueStrategy() {
+				@Override
+				public Object convert(Object value) {
+					return getImage(value);
+				}
+			});
 
 		return bindings;
 	}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java
index c2162455b5..e24a35efb3 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRenderer.java
@@ -138,28 +138,30 @@ public class DomainModelReferenceControlSWTRenderer extends SimpleControlSWTCont
 		final Binding[] bindings = new Binding[3];
 		final IObservableValue value = WidgetProperties.text().observe(setLabel);
 
-		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(), new UpdateValueStrategy() {
+		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy() {
 
-			@Override
-			public Object convert(Object value) { // target to model
-				try {
-					return getModelValue().getValue();
-				} catch (final DatabindingFailedException ex) {
-					Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
-					return null;
+				@Override
+				public Object convert(Object value) { // target to model
+					try {
+						return getModelValue().getValue();
+					} catch (final DatabindingFailedException ex) {
+						Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+						return null;
+					}
 				}
-			}
-		}, new UpdateValueStrategy() {// model to target
-			@Override
-			public Object convert(Object value) {
-				updateChangeListener((EObject) value);
-				return getText(value);
-			}
-		});
+			}), new UpdateValueStrategy() {// model to target
+				@Override
+				public Object convert(Object value) {
+					updateChangeListener((EObject) value);
+					return getText(value);
+				}
+			});
 
 		final IObservableValue imageValue = WidgetProperties.image().observe(imageLabel);
 		bindings[1] = getDataBindingContext().bindValue(imageValue, getModelValue(),
-			new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER), new UpdateValueStrategy() {
+			withPreSetValidation(new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)),
+			new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
 					return getImage(value);
@@ -170,7 +172,7 @@ public class DomainModelReferenceControlSWTRenderer extends SimpleControlSWTCont
 		bindings[2] = getDataBindingContext().bindValue(
 			setLabelTooltip,
 			getModelValue(),
-			new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER),
+			withPreSetValidation(new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)),
 			new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
@@ -303,7 +305,8 @@ public class DomainModelReferenceControlSWTRenderer extends SimpleControlSWTCont
 
 		unsetLabel = new Label(mainComposite, SWT.NONE);
 		GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(unsetLabel);
-		unsetLabel.setText(LocalizationServiceHelper.getString(getClass(), "LinkControl_NotSet")); //$NON-NLS-1$
+		unsetLabel.setText(
+			LocalizationServiceHelper.getString(DomainModelReferenceControlSWTRenderer.class, "LinkControl_NotSet")); //$NON-NLS-1$
 		unsetLabel.setBackground(mainComposite.getBackground());
 		unsetLabel.setForeground(parentComposite.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY));
 		unsetLabel.setAlignment(SWT.CENTER);
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java
index fcfd2c0d4b..c72260fba6 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/EReferenceLabelControlSWTRenderer.java
@@ -49,22 +49,22 @@ import org.osgi.framework.ServiceReference;
  */
 public class EReferenceLabelControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
-	private static final EMFFormsDatabinding emfFormsDatabinding;
-	private static final EMFFormsLabelProvider emfFormsLabelProvider;
-	private static final VTViewTemplateProvider vtViewTemplateProvider;
+	private static final EMFFormsDatabinding EMFFORMS_DATABINDING;
+	private static final EMFFormsLabelProvider EMFFORMS_LABELPROVIDER;
+	private static final VTViewTemplateProvider VT_VIEW_TEMPLATEPROVIDER;
 
 	static {
 		final BundleContext bundleContext = FrameworkUtil.getBundle(EReferenceLabelControlSWTRenderer.class)
 			.getBundleContext();
 		final ServiceReference<EMFFormsDatabinding> emfFormsDatabindingServiceReference = bundleContext
 			.getServiceReference(EMFFormsDatabinding.class);
-		emfFormsDatabinding = bundleContext.getService(emfFormsDatabindingServiceReference);
+		EMFFORMS_DATABINDING = bundleContext.getService(emfFormsDatabindingServiceReference);
 		final ServiceReference<EMFFormsLabelProvider> emfFormsLabelProviderServiceReference = bundleContext
 			.getServiceReference(EMFFormsLabelProvider.class);
-		emfFormsLabelProvider = bundleContext.getService(emfFormsLabelProviderServiceReference);
+		EMFFORMS_LABELPROVIDER = bundleContext.getService(emfFormsLabelProviderServiceReference);
 		final ServiceReference<VTViewTemplateProvider> vtViewTemplateProviderServiceReference = bundleContext
 			.getServiceReference(VTViewTemplateProvider.class);
-		vtViewTemplateProvider = bundleContext.getService(vtViewTemplateProviderServiceReference);
+		VT_VIEW_TEMPLATEPROVIDER = bundleContext.getService(vtViewTemplateProviderServiceReference);
 	}
 
 	/**
@@ -76,7 +76,8 @@ public class EReferenceLabelControlSWTRenderer extends SimpleControlSWTControlSW
 	 */
 	public EReferenceLabelControlSWTRenderer(VControl vElement, ViewModelContext viewContext,
 		ReportService reportService) {
-		super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider);
+		super(vElement, viewContext, reportService, EMFFORMS_DATABINDING, EMFFORMS_LABELPROVIDER,
+			VT_VIEW_TEMPLATEPROVIDER);
 	}
 
 	private Composite labelComposite;
@@ -98,27 +99,28 @@ public class EReferenceLabelControlSWTRenderer extends SimpleControlSWTControlSW
 		final Binding[] bindings = new Binding[3];
 		final IObservableValue value = WidgetProperties.text().observe(label);
 
-		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(), new UpdateValueStrategy() {
+		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy() {
 
-			@Override
-			public Object convert(Object value) {
-				try {
-					return getModelValue().getValue();
-				} catch (final DatabindingFailedException ex) {
-					Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
-					return null;
+				@Override
+				public Object convert(Object value) {
+					try {
+						return getModelValue().getValue();
+					} catch (final DatabindingFailedException ex) {
+						Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+						return null;
+					}
 				}
-			}
-		}, new UpdateValueStrategy() {
-			@Override
-			public Object convert(Object value) {
-				updateChangeListener((EObject) value);
-				return getText(value);
-			}
-		});
+			}), new UpdateValueStrategy() {
+				@Override
+				public Object convert(Object value) {
+					updateChangeListener((EObject) value);
+					return getText(value);
+				}
+			});
 		final IObservableValue tooltipValue = WidgetProperties.tooltipText().observe(label);
 		bindings[1] = getDataBindingContext().bindValue(tooltipValue, getModelValue(),
-			new UpdateValueStrategy() {
+			withPreSetValidation(new UpdateValueStrategy() {
 
 				@Override
 				public Object convert(Object value) {
@@ -129,7 +131,7 @@ public class EReferenceLabelControlSWTRenderer extends SimpleControlSWTControlSW
 						return null;
 					}
 				}
-			}, new UpdateValueStrategy() {
+			}), new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
 					return getText(value);
@@ -137,23 +139,24 @@ public class EReferenceLabelControlSWTRenderer extends SimpleControlSWTControlSW
 			});
 
 		final IObservableValue imageValue = WidgetProperties.image().observe(imageLabel);
-		bindings[2] = getDataBindingContext().bindValue(imageValue, getModelValue(), new UpdateValueStrategy() {
+		bindings[2] = getDataBindingContext().bindValue(imageValue, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy() {
 
-			@Override
-			public Object convert(Object value) {
-				try {
-					return getModelValue().getValue();
-				} catch (final DatabindingFailedException ex) {
-					Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
-					return null;
+				@Override
+				public Object convert(Object value) {
+					try {
+						return getModelValue().getValue();
+					} catch (final DatabindingFailedException ex) {
+						Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+						return null;
+					}
 				}
-			}
-		}, new UpdateValueStrategy() {
-			@Override
-			public Object convert(Object value) {
-				return getImage(value);
-			}
-		});
+			}), new UpdateValueStrategy() {
+				@Override
+				public Object convert(Object value) {
+					return getImage(value);
+				}
+			});
 
 		return bindings;
 	}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java
index 588bd79374..f03deb765b 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ExpectedValueControlRenderer.java
@@ -149,7 +149,7 @@ public abstract class ExpectedValueControlRenderer extends SimpleControlSWTContr
 		final IObservableValue value = org.eclipse.jface.databinding.swt.WidgetProperties.text().observe(text);
 
 		final Binding binding = getDataBindingContext().bindValue(value, getModelValue(),
-			targetToModelUpdateStrategy, modelToTargetUpdateStrategy);
+			withPreSetValidation(targetToModelUpdateStrategy), modelToTargetUpdateStrategy);
 		return new Binding[] { binding };
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java
index cdd5f29d46..75fe5db15a 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControl.java
@@ -13,6 +13,7 @@
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.internal.editor.controls;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -48,11 +49,13 @@ import org.eclipse.emf.ecp.view.spi.model.VControl;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.swt.reporting.RenderingFailedReport;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
+import org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration;
 import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
-import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.DeleteCommand;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -130,8 +133,12 @@ public class TableColumnsDMRTableControl extends SimpleControlSWTRenderer {
 	 *
 	 * @see org.eclipse.emf.ecp.view.spi.core.swt.SimpleControlSWTRenderer#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+	// BEGIN COMPLEX CODE
 	@Override
 	protected Control createControl(final Composite parent) throws DatabindingFailedException {
+
+		tableControl = (VTableControl) getViewModelContext().getDomainModel();
+
 		final IObservableValue observableValue = Activator.getDefault().getEMFFormsDatabinding()
 			.getObservableValue(getVElement().getDomainModelReference(), getViewModelContext().getDomainModel());
 		structuralFeature = (EStructuralFeature) observableValue.getValueType();
@@ -205,7 +212,6 @@ public class TableColumnsDMRTableControl extends SimpleControlSWTRenderer {
 			.getObservableList(getVElement().getDomainModelReference(), getViewModelContext().getDomainModel());
 		viewer.setInput(list);
 
-		tableControl = (VTableControl) getViewModelContext().getDomainModel();
 		adapter = new TableControlAdapter(parent, viewer);
 		tableControl.eAdapters().add(adapter);
 
@@ -217,6 +223,7 @@ public class TableColumnsDMRTableControl extends SimpleControlSWTRenderer {
 
 		return composite;
 	}
+	// END COMPLEX CODE
 
 	/**
 	 * @param viewer
@@ -242,7 +249,7 @@ public class TableColumnsDMRTableControl extends SimpleControlSWTRenderer {
 		composedAdapterFactory = new ComposedAdapterFactory(new AdapterFactory[] {
 			new CustomReflectiveItemProviderAdapterFactory(),
 			new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE) });
-		labelProvider = new AdapterFactoryLabelProvider(composedAdapterFactory);
+		labelProvider = new TableColumnsLabelProvider(composedAdapterFactory);
 	}
 
 	/**
@@ -270,6 +277,22 @@ public class TableColumnsDMRTableControl extends SimpleControlSWTRenderer {
 	}
 
 	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer#rootDomainModelChanged()
+	 */
+	@Override
+	protected void rootDomainModelChanged() throws DatabindingFailedException {
+		final IObservableList oldList = (IObservableList) viewer.getInput();
+		oldList.dispose();
+
+		final IObservableList list = getEMFFormsDatabinding().getObservableList(getVElement().getDomainModelReference(),
+			getViewModelContext().getDomainModel());
+		// addRelayoutListenerIfNeeded(list, composite);
+		viewer.setInput(list);
+	}
+
+	/**
 	 * Adapter set on the {@link VTableControl}.
 	 *
 	 */
@@ -362,9 +385,9 @@ public class TableColumnsDMRTableControl extends SimpleControlSWTRenderer {
 			super.widgetSelected(e);
 			final IStructuredSelection selection = IStructuredSelection.class.cast(viewer.getSelection());
 
+			/* use a delete command as we are the container and thus may leave a dangling hrefs */
 			final EditingDomain editingDomain = getEditingDomain(eObject);
-			editingDomain.getCommandStack().execute(
-				RemoveCommand.create(editingDomain, eObject, structuralFeature, selection.toList()));
+			editingDomain.getCommandStack().execute(DeleteCommand.create(editingDomain, selection.toList()));
 		}
 	}
 
@@ -478,19 +501,38 @@ public class TableColumnsDMRTableControl extends SimpleControlSWTRenderer {
 	}
 
 	/**
-	 * {@inheritDoc}
-	 * 
-	 * @see org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer#rootDomainModelChanged()
+	 * The label provider.
+	 *
+	 * @author Johannes Faltermeier
+	 *
 	 */
-	@Override
-	protected void rootDomainModelChanged() throws DatabindingFailedException {
-		final IObservableList oldList = (IObservableList) viewer.getInput();
-		oldList.dispose();
+	private final class TableColumnsLabelProvider extends AdapterFactoryLabelProvider {
 
-		final IObservableList list = getEMFFormsDatabinding().getObservableList(getVElement().getDomainModelReference(),
-			getViewModelContext().getDomainModel());
-		// addRelayoutListenerIfNeeded(list, composite);
-		viewer.setInput(list);
+		private TableColumnsLabelProvider(AdapterFactory adapterFactory) {
+			super(adapterFactory);
+		}
+
+		@Override
+		public String getColumnText(Object object, int columnIndex) {
+			final String text = super.getColumnText(object, columnIndex);
+			if (columnIndex == 0 && VDomainModelReference.class.isInstance(object)) {
+				for (final VTableColumnConfiguration configuration : tableControl.getColumnConfigurations()) {
+					if (!VWidthConfiguration.class.isInstance(configuration)) {
+						continue;
+					}
+					final VWidthConfiguration widthConfiguration = VWidthConfiguration.class.cast(configuration);
+					if (widthConfiguration.getColumnDomainReference() != object) {
+						continue;
+					}
+					return MessageFormat.format(
+						"{0} [minWidth={1}, weight={2}]", //$NON-NLS-1$
+						text,
+						widthConfiguration.getMinWidth(),
+						widthConfiguration.getWeight());
+				}
+			}
+			return text;
+		}
 	}
 
 }
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java
index 6016920f91..2cad661923 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRenderer.java
@@ -169,27 +169,28 @@ public class TableDetailViewControlSWTRenderer extends SimpleControlSWTControlSW
 		final Binding[] bindings = new Binding[3];
 		final IObservableValue value = WidgetProperties.text().observe(label);
 
-		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(), new UpdateValueStrategy() {
+		bindings[0] = getDataBindingContext().bindValue(value, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy() {
 
-			@Override
-			public Object convert(Object value) {
-				try {
-					return getModelValue().getValue();
-				} catch (final DatabindingFailedException ex) {
-					Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
-					return null;
+				@Override
+				public Object convert(Object value) {
+					try {
+						return getModelValue().getValue();
+					} catch (final DatabindingFailedException ex) {
+						Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+						return null;
+					}
 				}
-			}
-		}, new UpdateValueStrategy() {
-			@Override
-			public Object convert(Object value) {
-				return getText(value);
-			}
-		});
+			}), new UpdateValueStrategy() {
+				@Override
+				public Object convert(Object value) {
+					return getText(value);
+				}
+			});
 
 		final IObservableValue tooltipValue = WidgetProperties.tooltipText().observe(label);
 		bindings[1] = getDataBindingContext().bindValue(tooltipValue, getModelValue(),
-			new UpdateValueStrategy() {
+			withPreSetValidation(new UpdateValueStrategy() {
 
 				@Override
 				public Object convert(Object value) {
@@ -200,7 +201,7 @@ public class TableDetailViewControlSWTRenderer extends SimpleControlSWTControlSW
 						return null;
 					}
 				}
-			}, new UpdateValueStrategy() {
+			}), new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
 					return getText(value);
@@ -208,23 +209,24 @@ public class TableDetailViewControlSWTRenderer extends SimpleControlSWTControlSW
 			});
 
 		final IObservableValue imageValue = WidgetProperties.image().observe(imageLabel);
-		bindings[2] = getDataBindingContext().bindValue(imageValue, getModelValue(), new UpdateValueStrategy() {
+		bindings[2] = getDataBindingContext().bindValue(imageValue, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy() {
 
-			@Override
-			public Object convert(Object value) {
-				try {
-					return getModelValue().getValue();
-				} catch (final DatabindingFailedException ex) {
-					Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
-					return null;
+				@Override
+				public Object convert(Object value) {
+					try {
+						return getModelValue().getValue();
+					} catch (final DatabindingFailedException ex) {
+						Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+						return null;
+					}
 				}
-			}
-		}, new UpdateValueStrategy() {
-			@Override
-			public Object convert(Object value) {
-				return getImage(value);
-			}
-		});
+			}), new UpdateValueStrategy() {
+				@Override
+				public Object convert(Object value) {
+					return getImage(value);
+				}
+			});
 
 		return bindings;
 	}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableWidthConfigurationDMRRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableWidthConfigurationDMRRendererService.java
new file mode 100644
index 0000000000..d15af7aa5e
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableWidthConfigurationDMRRendererService.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.editor.controls;
+
+import org.eclipse.emf.databinding.IEMFValueProperty;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
+import org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+
+/**
+ * {@link EMFFormsDIRendererService} for {@link ColumnEnablementConfigurationDMRRenderer}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+@Component(name = "TableWidthConfigurationDMRRendererService", service = EMFFormsDIRendererService.class)
+public class TableWidthConfigurationDMRRendererService implements EMFFormsDIRendererService<VControl> {
+
+	private EMFFormsDatabindingEMF databinding;
+	private ReportService reportService;
+
+	/**
+	 * @param databinding {@link EMFFormsDatabindingEMF}
+	 */
+	@Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
+	public void setEMFFormsDatabindingEMF(EMFFormsDatabindingEMF databinding) {
+		this.databinding = databinding;
+	}
+
+	/**
+	 * @param reportService {@link ReportService}
+	 */
+	@Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
+	public void setreportService(ReportService reportService) {
+		this.reportService = reportService;
+	}
+
+	@Override
+	public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+		if (!VControl.class.isInstance(vElement)) {
+			return NOT_APPLICABLE;
+		}
+		final VDomainModelReference domainModelReference = VControl.class.cast(vElement).getDomainModelReference();
+		if (domainModelReference == null) {
+			return NOT_APPLICABLE;
+		}
+		try {
+			final IEMFValueProperty valueProperty = databinding.getValueProperty(
+				domainModelReference,
+				viewModelContext.getDomainModel());
+			if (viewModelContext.getDomainModel() instanceof VWidthConfiguration
+				&& valueProperty.getStructuralFeature() == VTablePackage.eINSTANCE
+					.getSingleColumnConfiguration_ColumnDomainReference()) {
+				return 3d;
+			}
+		} catch (final DatabindingFailedException ex) {
+			reportService.report(new AbstractReport(ex));
+		}
+
+		return NOT_APPLICABLE;
+	}
+
+	@Override
+	public Class<? extends AbstractSWTRenderer<VControl>> getRendererClass() {
+		return WidthConfigurationDMRRenderer.class;
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/WidthConfigurationDMRRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/WidthConfigurationDMRRenderer.java
new file mode 100644
index 0000000000..71b5e16e58
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/WidthConfigurationDMRRenderer.java
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.editor.controls;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.ecp.edit.spi.ReferenceService;
+import org.eclipse.emf.ecp.view.internal.core.swt.renderer.LinkControlSWTRenderer;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration;
+import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * Special {@link LinkControlSWTRenderer} which will streamline the column dmr selection.
+ *
+ * @author Edgar Mueller
+ *
+ */
+public class WidthConfigurationDMRRenderer extends LinkControlSWTRenderer {
+
+	private ColumnConfigurationDMRRendererReferenceService referenceService;
+
+	/**
+	 * @param vElement the element to render
+	 * @param viewContext the view model context
+	 * @param reportService the report service
+	 * @param emfFormsDatabinding the data binding service
+	 * @param emfFormsLabelProvider the label provider
+	 * @param vtViewTemplateProvider the view template provider
+	 * @param localizationService the localization service
+	 * @param imageRegistryService the image registry service
+	 * @param emfFormsEditSuppport the edit support
+	 */
+	@Inject
+	// CHECKSTYLE.OFF: ParameterNumber
+	public WidthConfigurationDMRRenderer(
+		VControl vElement,
+		ViewModelContext viewContext,
+		ReportService reportService,
+		EMFFormsDatabinding emfFormsDatabinding,
+		EMFFormsLabelProvider emfFormsLabelProvider,
+		VTViewTemplateProvider vtViewTemplateProvider,
+		EMFFormsLocalizationService localizationService,
+		ImageRegistryService imageRegistryService,
+		EMFFormsEditSupport emfFormsEditSuppport) {
+		// CHECKSTYLE.ON: ParameterNumber
+		super(
+			vElement,
+			viewContext,
+			reportService,
+			emfFormsDatabinding,
+			emfFormsLabelProvider,
+			vtViewTemplateProvider,
+			localizationService,
+			imageRegistryService,
+			emfFormsEditSuppport);
+	}
+
+	@Override
+	protected void createNewReferenceButton(Composite parent, String elementDisplayName) {
+		/* we only want users to select existing DMRs -> no-op */
+	}
+
+	@Override
+	protected ReferenceService getReferenceService() {
+		if (referenceService == null) {
+			referenceService = new ColumnConfigurationDMRRendererReferenceService(VWidthConfiguration.class);
+		}
+		return referenceService;
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
index 9322d52b84..9aa7ed84cb 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP String Modifier with Line Wrapping
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.linewrapper;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml
index 947e5e2e4b..9700b1e469 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
index 90e1ba876b..518a861b79 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dependency Injection SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.di;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.1,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.swt.graphics;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.osgi.framework;version="1.8.0"
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml
index fd957b1435..04e275d29c 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
index d748b5047c..ebf99fca2c 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.swt.Activator
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emf.ecp.ui.view.swt;version="1.12.0",
- org.eclipse.emf.ecp.view.internal.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test,org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.spi.swt;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.swt.layout;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt;version="1.13.0",
+ org.eclipse.emf.ecp.view.internal.swt;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test,org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.spi.swt;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.swt.layout;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.ui.view.swt.DefaultReferenceServiceFactory.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
  org.eclipse.jface;version="0.0.0",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml
index 260551fafb..3e285a9c75 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
index 7449658b32..8be4c2c9cc 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MPI UI View
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view;version="1.12.0",
- org.eclipse.emf.ecp.view.internal.provider;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.internal.ui;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
- org.eclipse.emf.ecp.view.spi.provider;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.renderer;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.ui.view;version="1.13.0",
+ org.eclipse.emf.ecp.view.internal.provider;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.internal.ui;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.spi.provider;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.renderer;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/EMFFormsViewService.xml
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
index 2c163dde6d..d0c0c1ffca 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
index c2c8e6c092..3226e82c2a 100644
--- a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.emfstore.ui,
    org.eclipse.emf.ecp.ui.rcp",
- org.eclipse.emf.ecp.internal.ui.composites;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.dialogs;version="1.12.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.internal.ui.model;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.e4,org.eclipse.emf.ecp.ui.e3,org.eclipse.emf.ecp.ui.transaction",
- org.eclipse.emf.ecp.internal.ui.tester;version="1.12.0",
- org.eclipse.emf.ecp.internal.ui.util;version="1.12.0";
+ org.eclipse.emf.ecp.internal.ui.composites;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.ui.dialogs;version="1.13.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.internal.ui.model;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.e4,org.eclipse.emf.ecp.ui.e3,org.eclipse.emf.ecp.ui.transaction",
+ org.eclipse.emf.ecp.internal.ui.tester;version="1.13.0",
+ org.eclipse.emf.ecp.internal.ui.util;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.ui.e3,
    org.eclipse.emf.ecp.ui.e4,
@@ -22,17 +22,17 @@ Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.12.0";
    org.eclipse.emf.ecp.validationvieweditorbridge,
    org.eclipse.emf.ecp.emfstore.ui,
    org.eclipse.emf.ecp.ui.rcp",
- org.eclipse.emf.ecp.internal.wizards;version="1.12.0";
+ org.eclipse.emf.ecp.internal.wizards;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.workspace.ui,
    org.eclipse.emf.ecp.view.table.editor,
    org.eclipse.emf.ecp.emfstore.ui",
- org.eclipse.emf.ecp.internal.wizards.page;version="1.12.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.spi.ui;version="1.12.0",
- org.eclipse.emf.ecp.spi.ui.util;version="1.12.0",
- org.eclipse.emf.ecp.ui;version="1.12.0",
- org.eclipse.emf.ecp.ui.common;version="1.12.0";
+ org.eclipse.emf.ecp.internal.wizards.page;version="1.13.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.spi.ui;version="1.13.0",
+ org.eclipse.emf.ecp.spi.ui.util;version="1.13.0",
+ org.eclipse.emf.ecp.ui;version="1.13.0",
+ org.eclipse.emf.ecp.ui.common;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,
    org.eclipse.emf.ecp.explorereditorbridge,
    org.eclipse.emf.ecp.ui.e3,
@@ -40,15 +40,15 @@ Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.12.0";
    org.eclipse.emf.ecp.view.ui.editor.test,
    org.eclipse.emf.ecp.workspace.ui,
    org.eclipse.emf.ecp.ui.e4",
- org.eclipse.emf.ecp.ui.common.dnd;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ui.util;version="1.12.0"
+ org.eclipse.emf.ecp.ui.common.dnd;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ui.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui/pom.xml b/bundles/org.eclipse.emf.ecp.ui/pom.xml
index 15e694ccf3..aa51197d65 100644
--- a/bundles/org.eclipse.emf.ecp.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ui</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
index 5628b6ab09..317da0b969 100644
--- a/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation Connector Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.connector;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.validation.connector.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.validation.connector;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.connector;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.validation;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml b/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
index 580b443fb5..46d209d397 100644
--- a/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation.connector</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/src/org/eclipse/emf/ecp/validation/connector/ValidationFailedDecorator.java b/bundles/org.eclipse.emf.ecp.validation.connector/src/org/eclipse/emf/ecp/validation/connector/ValidationFailedDecorator.java
index 31dc730f30..643d45bb2a 100644
--- a/bundles/org.eclipse.emf.ecp.validation.connector/src/org/eclipse/emf/ecp/validation/connector/ValidationFailedDecorator.java
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/src/org/eclipse/emf/ecp/validation/connector/ValidationFailedDecorator.java
@@ -1,100 +1,100 @@
-/*******************************************************************************

- * Copyright (c) 2011-2012 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Eugen Neufeld - initial API and implementation

- *

- *******************************************************************************/

-package org.eclipse.emf.ecp.validation.connector;

-

-import org.eclipse.emf.common.util.Diagnostic;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecp.core.ECPProject;

-import org.eclipse.emf.ecp.core.util.ECPUtil;

-import org.eclipse.jface.viewers.IDecoration;

-import org.eclipse.jface.viewers.ILabelProviderListener;

-import org.eclipse.jface.viewers.ILightweightLabelDecorator;

-

-/**

- * This class decorates the navigator if the validation of a project fails.

- *

- * @author Eugen Neufeld

- * @author emueller

- */

-public class ValidationFailedDecorator implements ILightweightLabelDecorator {

-

-	/**

-	 * {@inheritDoc}

-	 */

-	@Override

-	public void decorate(final Object element, IDecoration decoration) {

-		if (!(element instanceof EObject) && !(element instanceof ECPProject)) {

-			return;

-		}

-

-		Integer severity = null;

-

-		if (element instanceof EObject) {

-

-			final ECPProject project = ECPUtil.getECPProjectManager().getProject(element);

-

-			if (project != null && project.isOpen()) {

-				severity = Activator.getDefault().getValidationService(project).getDiagnostic(element).getSeverity();

-			}

-		} else if (element instanceof ECPProject && ((ECPProject) element).isOpen()) {

-			if (ECPUtil.getECPProjectManager().getProject(((ECPProject) element).getName()) == null) {

-				return;

-			}

-			severity = Activator.getDefault().getValidationService((ECPProject) element).getRootDiagnostic()

-				.getSeverity();

-		}

-

-		if (severity == null) {

-			return;

-		}

-

-		switch (severity.intValue()) {

-		case Diagnostic.ERROR:

-			decoration.addOverlay(Activator.getImageDescriptor("icons/error_decorate.png"), IDecoration.BOTTOM_RIGHT); //$NON-NLS-1$

-			break;

-		case Diagnostic.WARNING:

-			decoration.addOverlay(Activator.getImageDescriptor("icons/warning_decorate.png"), IDecoration.BOTTOM_RIGHT); //$NON-NLS-1$

-			break;

-		case Diagnostic.OK:

-			decoration.addOverlay(null);

-			break;

-		default:

-			break;

-		}

-

-	}

-

-	/** {@inheritDoc} */

-	@Override

-	public void addListener(ILabelProviderListener listener) {

-

-	}

-

-	/** {@inheritDoc} */

-	@Override

-	public void dispose() {

-

-	}

-

-	/** {@inheritDoc} */

-	@Override

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

-		return false;

-	}

-

-	/** {@inheritDoc} */

-	@Override

-	public void removeListener(ILabelProviderListener listener) {

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2011-2012 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.emf.ecp.validation.connector;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.core.ECPProject;
+import org.eclipse.emf.ecp.core.util.ECPUtil;
+import org.eclipse.jface.viewers.IDecoration;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
+
+/**
+ * This class decorates the navigator if the validation of a project fails.
+ *
+ * @author Eugen Neufeld
+ * @author emueller
+ */
+public class ValidationFailedDecorator implements ILightweightLabelDecorator {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public void decorate(final Object element, IDecoration decoration) {
+		if (!(element instanceof EObject) && !(element instanceof ECPProject)) {
+			return;
+		}
+
+		Integer severity = null;
+
+		if (element instanceof EObject) {
+
+			final ECPProject project = ECPUtil.getECPProjectManager().getProject(element);
+
+			if (project != null && project.isOpen()) {
+				severity = Activator.getDefault().getValidationService(project).getDiagnostic(element).getSeverity();
+			}
+		} else if (element instanceof ECPProject && ((ECPProject) element).isOpen()) {
+			if (ECPUtil.getECPProjectManager().getProject(((ECPProject) element).getName()) == null) {
+				return;
+			}
+			severity = Activator.getDefault().getValidationService((ECPProject) element).getRootDiagnostic()
+				.getSeverity();
+		}
+
+		if (severity == null) {
+			return;
+		}
+
+		switch (severity.intValue()) {
+		case Diagnostic.ERROR:
+			decoration.addOverlay(Activator.getImageDescriptor("icons/error_decorate.png"), IDecoration.BOTTOM_RIGHT); //$NON-NLS-1$
+			break;
+		case Diagnostic.WARNING:
+			decoration.addOverlay(Activator.getImageDescriptor("icons/warning_decorate.png"), IDecoration.BOTTOM_RIGHT); //$NON-NLS-1$
+			break;
+		case Diagnostic.OK:
+			decoration.addOverlay(null);
+			break;
+		default:
+			break;
+		}
+
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void addListener(ILabelProviderListener listener) {
+
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void dispose() {
+
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public boolean isLabelProperty(Object element, String property) {
+		return false;
+	}
+
+	/** {@inheritDoc} */
+	@Override
+	public void removeListener(ILabelProviderListener listener) {
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
index 14d85c71a2..9da4ee504d 100644
--- a/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.api;version="1.12.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
+Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.api;version="1.13.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/validationService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.validation/pom.xml b/bundles/org.eclipse.emf.ecp.validation/pom.xml
index 42756192e2..616d196586 100644
--- a/bundles/org.eclipse.emf.ecp.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
index 6eaae1dd29..c8dced45a3 100644
--- a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation View to Editor Bridge
 Bundle-SymbolicName: org.eclipse.emf.ecp.validationvieweditorbridge;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jface.viewers;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
index d5eb4c4d06..d900bd44d5 100644
--- a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validationvieweditorbridge</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
index 527d681fad..d6f038d902 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.categorization.model.provider.CategorizationEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml
index 288514e571..56acaca71d 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/AbstractCategorizationItemProvider.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/AbstractCategorizationItemProvider.java
index 84f66182fb..73a117b60f 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/AbstractCategorizationItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/AbstractCategorizationItemProvider.java
@@ -30,21 +30,19 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class AbstractCategorizationItemProvider
-	extends CategorizableElementItemProvider
-{
+	extends CategorizableElementItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public AbstractCategorizationItemProvider(AdapterFactory adapterFactory)
-	{
+	public AbstractCategorizationItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -52,14 +50,12 @@ public class AbstractCategorizationItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -72,14 +68,12 @@ public class AbstractCategorizationItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(VCategorizationPackage.Literals.ABSTRACT_CATEGORIZATION__ACTIONS);
 		}
@@ -89,12 +83,11 @@ public class AbstractCategorizationItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -109,14 +102,12 @@ public class AbstractCategorizationItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		String label = ((VAbstractCategorization) object).getLabel();
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_AbstractCategorization_type") : //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_AbstractCategorization_type") : //$NON-NLS-1$
 			getString("_UI_AbstractCategorization_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -125,16 +116,14 @@ public class AbstractCategorizationItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VAbstractCategorization.class))
-		{
+		switch (notification.getFeatureID(VAbstractCategorization.class)) {
 		case VCategorizationPackage.ABSTRACT_CATEGORIZATION__ACTIONS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -147,18 +136,15 @@ public class AbstractCategorizationItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.ABSTRACT_CATEGORIZATION__ACTIONS,
-				VCategorizationFactory.eINSTANCE.createAction()));
+		newChildDescriptors.add(createChildParameter(VCategorizationPackage.Literals.ABSTRACT_CATEGORIZATION__ACTIONS,
+			VCategorizationFactory.eINSTANCE.createAction()));
 	}
 
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/ActionItemProvider.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/ActionItemProvider.java
index 6ee15479a9..168dda04cb 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/ActionItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/ActionItemProvider.java
@@ -35,7 +35,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ActionItemProvider
@@ -45,17 +45,15 @@ public class ActionItemProvider
 	IStructuredItemContentProvider,
 	ITreeItemContentProvider,
 	IItemLabelProvider,
-	IItemPropertySource
-{
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public ActionItemProvider(AdapterFactory adapterFactory)
-	{
+	public ActionItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -63,14 +61,12 @@ public class ActionItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addBundlePropertyDescriptor(object);
@@ -83,14 +79,12 @@ public class ActionItemProvider
 	 * This adds a property descriptor for the Bundle feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addBundlePropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addBundlePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Action_bundle_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Action_bundle_feature", "_UI_Action_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -107,14 +101,12 @@ public class ActionItemProvider
 	 * This adds a property descriptor for the Class Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addClassNamePropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addClassNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Action_className_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Action_className_feature", "_UI_Action_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -131,12 +123,11 @@ public class ActionItemProvider
 	 * This returns Action.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/Action")); //$NON-NLS-1$
 	}
 
@@ -144,15 +135,13 @@ public class ActionItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final String label = ((VAction) object).getClassName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Action_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		String label = ((VAction) object).getClassName();
+		return label == null || label.length() == 0 ? getString("_UI_Action_type") : //$NON-NLS-1$
 			getString("_UI_Action_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -161,16 +150,14 @@ public class ActionItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VAction.class))
-		{
+		switch (notification.getFeatureID(VAction.class)) {
 		case VCategorizationPackage.ACTION__BUNDLE:
 		case VCategorizationPackage.ACTION__CLASS_NAME:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
@@ -184,12 +171,11 @@ public class ActionItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -197,12 +183,11 @@ public class ActionItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizableElementItemProvider.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizableElementItemProvider.java
index 7c5fc2c55f..e305443262 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizableElementItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizableElementItemProvider.java
@@ -20,9 +20,11 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.VElementUtil;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.model.provider.ElementItemProvider;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 /**
@@ -34,8 +36,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * @generated
  */
 public class CategorizableElementItemProvider
-	extends ElementItemProvider
-{
+	extends ElementItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -43,8 +44,7 @@ public class CategorizableElementItemProvider
 	 *
 	 * @generated
 	 */
-	public CategorizableElementItemProvider(AdapterFactory adapterFactory)
-	{
+	public CategorizableElementItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -56,34 +56,54 @@ public class CategorizableElementItemProvider
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addTooltipPropertyDescriptor(object);
 			addLabelObjectPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Tooltip feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @since 1.13
+	 */
+	protected void addTooltipPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_HasTooltip_tooltip_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_HasTooltip_tooltip_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_HasTooltip_type"), //$NON-NLS-1$
+				VViewPackage.Literals.HAS_TOOLTIP__TOOLTIP,
+				true,
+				true,
+				false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Label Object feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
-	protected void addLabelObjectPropertyDescriptor(Object object)
-	{
+	protected void addLabelObjectPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_CategorizableElement_labelObject_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_CategorizableElement_labelObject_feature", "_UI_CategorizableElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_CategorizableElement_labelObject_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_CategorizableElement_type"), //$NON-NLS-1$
 				VCategorizationPackage.Literals.CATEGORIZABLE_ELEMENT__LABEL_OBJECT,
 				false,
 				false,
@@ -101,14 +121,12 @@ public class CategorizableElementItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		String label = ((VCategorizableElement) object).getLabel();
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_CategorizableElement_type") : //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_CategorizableElement_type") : //$NON-NLS-1$
 			getString("_UI_CategorizableElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -121,12 +139,11 @@ public class CategorizableElementItemProvider
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VCategorizableElement.class))
-		{
+		switch (notification.getFeatureID(VCategorizableElement.class)) {
+		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP:
 		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__LABEL_OBJECT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -143,8 +160,7 @@ public class CategorizableElementItemProvider
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationEditPlugin.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationEditPlugin.java
index 60ec328606..4a5030d952 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationEditPlugin.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationEditPlugin.java
@@ -13,23 +13,21 @@ package org.eclipse.emf.ecp.view.spi.categorization.model.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 import org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin;
 
 /**
  * This is the central singleton for the Categorization edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public final class CategorizationEditPlugin extends EMFPlugin
-{
+public final class CategorizationEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final CategorizationEditPlugin INSTANCE = new CategorizationEditPlugin();
@@ -38,7 +36,7 @@ public final class CategorizationEditPlugin extends EMFPlugin
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -47,14 +45,11 @@ public final class CategorizationEditPlugin extends EMFPlugin
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public CategorizationEditPlugin()
-	{
-		super(new ResourceLocator[]
-		{
-			EcoreEditPlugin.INSTANCE,
+	public CategorizationEditPlugin() {
+		super(new ResourceLocator[] {
 			ViewEditPlugin.INSTANCE,
 		});
 	}
@@ -63,13 +58,12 @@ public final class CategorizationEditPlugin extends EMFPlugin
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getPluginResourceLocator()
-	{
+	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}
 
@@ -77,12 +71,11 @@ public final class CategorizationEditPlugin extends EMFPlugin
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
-	public static Implementation getPlugin()
-	{
+	public static Implementation getPlugin() {
 		return plugin;
 	}
 
@@ -90,20 +83,18 @@ public final class CategorizationEditPlugin extends EMFPlugin
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static class Implementation extends EclipsePlugin
-	{
+	public static class Implementation extends EclipsePlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
-		public Implementation()
-		{
+		public Implementation() {
 			super();
 
 			// Remember the static instance.
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationElementItemProvider.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationElementItemProvider.java
index 0e140e53c8..fe877ece88 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationElementItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationElementItemProvider.java
@@ -37,21 +37,19 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class CategorizationElementItemProvider
-	extends ContainedElementItemProvider
-{
+	extends ContainedElementItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public CategorizationElementItemProvider(AdapterFactory adapterFactory)
-	{
+	public CategorizationElementItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -59,14 +57,12 @@ public class CategorizationElementItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addMainCategoryDepthPropertyDescriptor(object);
@@ -78,19 +74,16 @@ public class CategorizationElementItemProvider
 	 * This adds a property descriptor for the Main Category Depth feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addMainCategoryDepthPropertyDescriptor(Object object)
-	{
+	protected void addMainCategoryDepthPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_CategorizationElement_mainCategoryDepth_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_CategorizationElement_mainCategoryDepth_feature", "_UI_CategorizationElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_CategorizationElement_mainCategoryDepth_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_CategorizationElement_type"), //$NON-NLS-1$
 				VCategorizationPackage.Literals.CATEGORIZATION_ELEMENT__MAIN_CATEGORY_DEPTH,
 				true,
 				false,
@@ -106,14 +99,12 @@ public class CategorizationElementItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(VCategorizationPackage.Literals.CATEGORIZATION_ELEMENT__CATEGORIZATIONS);
 		}
@@ -123,12 +114,11 @@ public class CategorizationElementItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -139,12 +129,11 @@ public class CategorizationElementItemProvider
 	 * This returns CategorizationElement.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/CategorizationElement")); //$NON-NLS-1$
 	}
 
@@ -156,14 +145,12 @@ public class CategorizationElementItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		String label = ((VCategorizationElement) object).getLabel();
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_CategorizationElement_type") : label; //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_CategorizationElement_type") : label; //$NON-NLS-1$
 	}
 
 	/**
@@ -171,16 +158,14 @@ public class CategorizationElementItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VCategorizationElement.class))
-		{
+		switch (notification.getFeatureID(VCategorizationElement.class)) {
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__MAIN_CATEGORY_DEPTH:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -196,22 +181,19 @@ public class CategorizationElementItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORIZATION_ELEMENT__CATEGORIZATIONS,
+		newChildDescriptors
+			.add(createChildParameter(VCategorizationPackage.Literals.CATEGORIZATION_ELEMENT__CATEGORIZATIONS,
 				VCategorizationFactory.eINSTANCE.createCategorization()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORIZATION_ELEMENT__CATEGORIZATIONS,
+		newChildDescriptors
+			.add(createChildParameter(VCategorizationPackage.Literals.CATEGORIZATION_ELEMENT__CATEGORIZATIONS,
 				VCategorizationFactory.eINSTANCE.createCategory()));
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProvider.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProvider.java
index 039db3461d..1f95d1fab6 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProvider.java
@@ -31,21 +31,19 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class CategorizationItemProvider
-	extends AbstractCategorizationItemProvider
-{
+	extends AbstractCategorizationItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public CategorizationItemProvider(AdapterFactory adapterFactory)
-	{
+	public CategorizationItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -53,14 +51,12 @@ public class CategorizationItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -73,14 +69,12 @@ public class CategorizationItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(VCategorizationPackage.Literals.CATEGORIZATION__CATEGORIZATIONS);
 		}
@@ -90,12 +84,11 @@ public class CategorizationItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -106,12 +99,11 @@ public class CategorizationItemProvider
 	 * This returns Categorization.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/Categorization")); //$NON-NLS-1$
 	}
 
@@ -123,14 +115,12 @@ public class CategorizationItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		String label = ((VCategorization) object).getLabel();
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_Categorization_type") : label; //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_Categorization_type") : label; //$NON-NLS-1$
 	}
 
 	/**
@@ -138,16 +128,14 @@ public class CategorizationItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VCategorization.class))
-		{
+		switch (notification.getFeatureID(VCategorization.class)) {
 		case VCategorizationPackage.CATEGORIZATION__CATEGORIZATIONS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -160,23 +148,18 @@ public class CategorizationItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORIZATION__CATEGORIZATIONS,
-				VCategorizationFactory.eINSTANCE.createCategorization()));
+		newChildDescriptors.add(createChildParameter(VCategorizationPackage.Literals.CATEGORIZATION__CATEGORIZATIONS,
+			VCategorizationFactory.eINSTANCE.createCategorization()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORIZATION__CATEGORIZATIONS,
-				VCategorizationFactory.eINSTANCE.createCategory()));
+		newChildDescriptors.add(createChildParameter(VCategorizationPackage.Literals.CATEGORIZATION__CATEGORIZATIONS,
+			VCategorizationFactory.eINSTANCE.createCategory()));
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProviderAdapterFactory.java
index c4c8b96802..7f25f0c495 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategorizationItemProviderAdapterFactory.java
@@ -51,17 +51,16 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class CategorizationItemProviderAdapterFactory extends CategorizationAdapterFactory implements
-	ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender
-{
+	ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -70,7 +69,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -79,7 +78,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This helps manage the child creation extenders.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
@@ -89,7 +88,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -98,11 +97,10 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public CategorizationItemProviderAdapterFactory()
-	{
+	public CategorizationItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -115,7 +113,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected CategorizationItemProvider categorizationItemProvider;
@@ -124,14 +122,12 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createCategorizationAdapter()
-	{
-		if (categorizationItemProvider == null)
-		{
+	public Adapter createCategorizationAdapter() {
+		if (categorizationItemProvider == null) {
 			categorizationItemProvider = new CategorizationItemProvider(this);
 		}
 
@@ -143,7 +139,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategory} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected CategoryItemProvider categoryItemProvider;
@@ -152,14 +148,12 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createCategoryAdapter()
-	{
-		if (categoryItemProvider == null)
-		{
+	public Adapter createCategoryAdapter() {
+		if (categoryItemProvider == null) {
 			categoryItemProvider = new CategoryItemProvider(this);
 		}
 
@@ -171,7 +165,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ActionItemProvider actionItemProvider;
@@ -180,14 +174,12 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createActionAdapter()
-	{
-		if (actionItemProvider == null)
-		{
+	public Adapter createActionAdapter() {
+		if (actionItemProvider == null) {
 			actionItemProvider = new ActionItemProvider(this);
 		}
 
@@ -199,7 +191,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected CategorizationElementItemProvider categorizationElementItemProvider;
@@ -208,14 +200,12 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createCategorizationElementAdapter()
-	{
-		if (categorizationElementItemProvider == null)
-		{
+	public Adapter createCategorizationElementAdapter() {
+		if (categorizationElementItemProvider == null) {
 			categorizationElementItemProvider = new CategorizationElementItemProvider(this);
 		}
 
@@ -226,12 +216,11 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ComposeableAdapterFactory getRootAdapterFactory()
-	{
+	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
 
@@ -239,24 +228,22 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
-	{
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean isFactoryForType(Object type)
-	{
+	public boolean isFactoryForType(Object type) {
 		return supportedTypes.contains(type) || super.isFactoryForType(type);
 	}
 
@@ -264,29 +251,25 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter adapt(Notifier notifier, Object type)
-	{
+	public Adapter adapt(Notifier notifier, Object type) {
 		return super.adapt(notifier, this);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object adapt(Object object, Object type)
-	{
-		if (isFactoryForType(type))
-		{
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
-			{
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -297,35 +280,32 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public List<IChildCreationExtender> getChildCreationExtenders()
-	{
+	public List<IChildCreationExtender> getChildCreationExtenders() {
 		return childCreationExtenderManager.getChildCreationExtenders();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain)
-	{
+	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
 		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return childCreationExtenderManager;
 	}
 
@@ -333,12 +313,11 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void addListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
 
@@ -346,12 +325,11 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void removeListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
 
@@ -359,16 +337,14 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void fireNotifyChanged(Notification notification)
-	{
+	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null)
-		{
+		if (parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -377,49 +353,42 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void dispose()
-	{
-		if (categorizationItemProvider != null) {
+	public void dispose() {
+		if (categorizationItemProvider != null)
 			categorizationItemProvider.dispose();
-		}
-		if (categoryItemProvider != null) {
+		if (categoryItemProvider != null)
 			categoryItemProvider.dispose();
-		}
-		if (actionItemProvider != null) {
+		if (actionItemProvider != null)
 			actionItemProvider.dispose();
-		}
-		if (categorizationElementItemProvider != null) {
+		if (categorizationElementItemProvider != null)
 			categorizationElementItemProvider.dispose();
-		}
 	}
 
 	/**
 	 * A child creation extender for the {@link VViewPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static class ViewChildCreationExtender implements IChildCreationExtender
-	{
+	public static class ViewChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
-		protected static class CreationSwitch extends ViewSwitch<Object>
-		{
+		protected static class CreationSwitch extends ViewSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			protected List<Object> newChildDescriptors;
@@ -428,7 +397,7 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 			 * The domain in which to create the children.
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			protected EditingDomain editingDomain;
@@ -437,11 +406,10 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 			 * Creates the a switch for populating child descriptors in the given domain.
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain)
-			{
+			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
 				this.newChildDescriptors = newChildDescriptors;
 				this.editingDomain = editingDomain;
 			}
@@ -449,16 +417,13 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 			/**
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			@Override
-			public Object caseView(VView object)
-			{
-				newChildDescriptors.add
-					(createChildParameter
-					(VViewPackage.Literals.VIEW__CHILDREN,
-						VCategorizationFactory.eINSTANCE.createCategorizationElement()));
+			public Object caseView(VView object) {
+				newChildDescriptors.add(createChildParameter(VViewPackage.Literals.VIEW__CHILDREN,
+					VCategorizationFactory.eINSTANCE.createCategorizationElement()));
 
 				return null;
 			}
@@ -466,16 +431,13 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 			/**
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			@Override
-			public Object caseContainer(VContainer object)
-			{
-				newChildDescriptors.add
-					(createChildParameter
-					(VViewPackage.Literals.CONTAINER__CHILDREN,
-						VCategorizationFactory.eINSTANCE.createCategorizationElement()));
+			public Object caseContainer(VContainer object) {
+				newChildDescriptors.add(createChildParameter(VViewPackage.Literals.CONTAINER__CHILDREN,
+					VCategorizationFactory.eINSTANCE.createCategorizationElement()));
 
 				return null;
 			}
@@ -483,11 +445,10 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 			/**
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
-			protected CommandParameter createChildParameter(Object feature, Object child)
-			{
+			protected CommandParameter createChildParameter(Object feature, Object child) {
 				return new CommandParameter(null, feature, child);
 			}
 
@@ -496,13 +457,12 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain)
-		{
-			final ArrayList<Object> result = new ArrayList<Object>();
+		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+			ArrayList<Object> result = new ArrayList<Object>();
 			new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
 			return result;
 		}
@@ -510,12 +470,11 @@ public class CategorizationItemProviderAdapterFactory extends CategorizationAdap
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
-		public ResourceLocator getResourceLocator()
-		{
+		public ResourceLocator getResourceLocator() {
 			return CategorizationEditPlugin.INSTANCE;
 		}
 	}
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategoryItemProvider.java b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategoryItemProvider.java
index a60f464215..6d9548408b 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategoryItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/src/org/eclipse/emf/ecp/view/spi/categorization/model/provider/CategoryItemProvider.java
@@ -32,21 +32,19 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategory} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class CategoryItemProvider
-	extends AbstractCategorizationItemProvider
-{
+	extends AbstractCategorizationItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public CategoryItemProvider(AdapterFactory adapterFactory)
-	{
+	public CategoryItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -54,14 +52,12 @@ public class CategoryItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -74,14 +70,12 @@ public class CategoryItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(VCategorizationPackage.Literals.CATEGORY__COMPOSITE);
 		}
@@ -91,12 +85,11 @@ public class CategoryItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -107,12 +100,11 @@ public class CategoryItemProvider
 	 * This returns Category.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/Category")); //$NON-NLS-1$
 	}
 
@@ -124,14 +116,12 @@ public class CategoryItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		String label = ((VCategory) object).getLabel();
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_Category_type") : label; //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_Category_type") : label; //$NON-NLS-1$
 	}
 
 	/**
@@ -139,16 +129,14 @@ public class CategoryItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VCategory.class))
-		{
+		switch (notification.getFeatureID(VCategory.class)) {
 		case VCategorizationPackage.CATEGORY__COMPOSITE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -165,28 +153,19 @@ public class CategoryItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
-				VCategorizationFactory.eINSTANCE.createCategorizationElement()));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
-				VViewFactory.eINSTANCE.createControl()));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
-				VHorizontalFactory.eINSTANCE.createHorizontalLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
-				VVerticalFactory.eINSTANCE.createVerticalLayout()));
+		newChildDescriptors.add(createChildParameter(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
+			VCategorizationFactory.eINSTANCE.createCategorizationElement()));
+
+		newChildDescriptors.add(createChildParameter(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
+			VViewFactory.eINSTANCE.createControl()));
+
+		newChildDescriptors.add(createChildParameter(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
+			VHorizontalFactory.eINSTANCE.createHorizontalLayout()));
+
+		newChildDescriptors.add(createChildParameter(VCategorizationPackage.Literals.CATEGORY__COMPOSITE,
+			VVerticalFactory.eINSTANCE.createVerticalLayout()));
 	}
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.categorization.model/.settings/.api_filters
index 8cb50f0dda..0a95834a77 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/.settings/.api_filters
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.emf.ecp.view.categorization.model" version="2">
     <resource path="META-INF/MANIFEST.MF">
+        <filter comment="SPI Change in 1.13.0" id="923795461">
+            <message_arguments>
+                <message_argument value="1.13.0"/>
+                <message_argument value="1.12.0"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Change in 1.6" id="923795461">
             <message_arguments>
                 <message_argument value="1.6.0"/>
@@ -33,6 +39,13 @@
         </filter>
     </resource>
     <resource path="src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationPackage.java" type="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage">
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="ABSTRACT_CATEGORIZATION_FEATURE_COUNT"/>
+                <message_argument value="10"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -61,6 +74,13 @@
                 <message_argument value="8"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="ABSTRACT_CATEGORIZATION__ACTIONS"/>
+                <message_argument value="9"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -96,6 +116,13 @@
                 <message_argument value="7"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="ABSTRACT_CATEGORIZATION__LABEL_OBJECT"/>
+                <message_argument value="8"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -124,6 +151,13 @@
                 <message_argument value="8"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZABLE_ELEMENT_FEATURE_COUNT"/>
+                <message_argument value="9"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -159,6 +193,13 @@
                 <message_argument value="7"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZABLE_ELEMENT__LABEL_OBJECT"/>
+                <message_argument value="8"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -271,6 +312,13 @@
                 <message_argument value="10"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION_FEATURE_COUNT"/>
+                <message_argument value="11"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -292,6 +340,13 @@
                 <message_argument value="8"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION__ACTIONS"/>
+                <message_argument value="9"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -299,6 +354,13 @@
                 <message_argument value="5"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION__CATEGORIZATIONS"/>
+                <message_argument value="10"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -341,6 +403,13 @@
                 <message_argument value="7"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION__LABEL_OBJECT"/>
+                <message_argument value="8"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -362,6 +431,13 @@
                 <message_argument value="10"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORY_FEATURE_COUNT"/>
+                <message_argument value="11"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -383,6 +459,13 @@
                 <message_argument value="8"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORY__ACTIONS"/>
+                <message_argument value="9"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -390,6 +473,13 @@
                 <message_argument value="5"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORY__COMPOSITE"/>
+                <message_argument value="10"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -432,6 +522,13 @@
                 <message_argument value="7"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORY__LABEL_OBJECT"/>
+                <message_argument value="8"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
@@ -446,5 +543,89 @@
                 <message_argument value="1"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="ABSTRACT_CATEGORIZATION__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="ABSTRACT_CATEGORIZATION__TOOLTIP"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="ABSTRACT_CATEGORIZATION__UUID"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZABLE_ELEMENT__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZABLE_ELEMENT__TOOLTIP"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZABLE_ELEMENT__UUID"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION_ELEMENT__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION_ELEMENT__UUID"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION__TOOLTIP"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORIZATION__UUID"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORY__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORY__TOOLTIP"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change in 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage"/>
+                <message_argument value="CATEGORY__UUID"/>
+            </message_arguments>
+        </filter>
     </resource>
 </component>
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
index 0c2a5846c1..ae7b746147 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
index 51ef154518..405c88f637 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="categorization" nsURI="http://org/eclipse/emf/ecp/view/categorization/model"

-    nsPrefix="org.eclipse.emf.ecp.view.categorization.model">

-  <eClassifiers xsi:type="ecore:EClass" name="AbstractCategorization" abstract="true"

-      eSuperTypes="#//CategorizableElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"

-        eType="#//Action" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Categorization" eSuperTypes="#//AbstractCategorization">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="categorizations" upperBound="-1"

-        eType="#//AbstractCategorization" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Category" eSuperTypes="#//AbstractCategorization">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="composite" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Action">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundle" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="CategorizationElement" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="categorizations" upperBound="-1"

-        eType="#//AbstractCategorization" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="currentSelection" eType="#//CategorizableElement"

-        transient="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mainCategoryDepth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"

-        defaultValueLiteral="0"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="CategorizableElement" abstract="true"

-      eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Element">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="labelObject" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"

-        changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/>

-  </eClassifiers>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="categorization" nsURI="http://org/eclipse/emf/ecp/view/categorization/model"
+    nsPrefix="org.eclipse.emf.ecp.view.categorization.model">
+  <eClassifiers xsi:type="ecore:EClass" name="AbstractCategorization" abstract="true"
+      eSuperTypes="#//CategorizableElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="actions" upperBound="-1"
+        eType="#//Action" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Categorization" eSuperTypes="#//AbstractCategorization">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="categorizations" upperBound="-1"
+        eType="#//AbstractCategorization" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Category" eSuperTypes="#//AbstractCategorization">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="composite" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Action">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundle" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CategorizationElement" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="categorizations" upperBound="-1"
+        eType="#//AbstractCategorization" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="currentSelection" eType="#//CategorizableElement"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mainCategoryDepth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CategorizableElement" abstract="true"
+      eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Element ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//HasTooltip">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="labelObject" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
+        changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.genmodel b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.genmodel
index 2574bcdcfb..00eebb7334 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.genmodel
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.genmodel
@@ -6,7 +6,7 @@
     editPluginClass="org.eclipse.emf.ecp.view.spi.categorization.model.provider.CategorizationEditPlugin"
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" commentFormatting="true" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
+    complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
     interfaceNamePattern="V{0}" classNamePattern="V{0}Impl" importOrganizing="true">
   <foreignModel>categorization.ecore</foreignModel>
   <genPackages prefix="Categorization" basePackage="org.eclipse.emf.ecp.view.spi"
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml
index 50c99778cc..390256a0c9 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAbstractCategorization.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAbstractCategorization.java
index e308a1584a..180e70fb4b 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAbstractCategorization.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAbstractCategorization.java
@@ -20,17 +20,17 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization#getActions <em>Actions</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization#getActions
+ * <em>Actions</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getAbstractCategorization()
  * @model abstract="true"
  * @generated
  */
-public interface VAbstractCategorization extends VCategorizableElement
-{
+public interface VAbstractCategorization extends VCategorizableElement {
 	/**
 	 * Returns the value of the '<em><b>Actions</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction}.
@@ -40,7 +40,7 @@ public interface VAbstractCategorization extends VCategorizableElement
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Actions</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getAbstractCategorization_Actions()
 	 * @model containment="true"
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAction.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAction.java
index 85e24be543..22093b44df 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAction.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VAction.java
@@ -20,18 +20,17 @@ import org.eclipse.emf.ecore.EObject;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getBundle <em>Bundle</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getClassName <em>Class Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getAction()
  * @model
  * @generated
  */
-public interface VAction extends EObject
-{
+public interface VAction extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Bundle</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -40,7 +39,7 @@ public interface VAction extends EObject
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Bundle</em>' attribute.
 	 * @see #setBundle(String)
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getAction_Bundle()
@@ -54,7 +53,7 @@ public interface VAction extends EObject
 	 * <em>Bundle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Bundle</em>' attribute.
 	 * @see #getBundle()
 	 * @generated
@@ -69,7 +68,7 @@ public interface VAction extends EObject
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Class Name</em>' attribute.
 	 * @see #setClassName(String)
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getAction_ClassName()
@@ -79,11 +78,11 @@ public interface VAction extends EObject
 	String getClassName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getClassName
-	 * <em>Class Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getClassName <em>Class
+	 * Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Class Name</em>' attribute.
 	 * @see #getClassName()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizableElement.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizableElement.java
index f1ceed90e0..9d158d8614 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizableElement.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizableElement.java
@@ -15,6 +15,7 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 
 /**
  * <!-- begin-user-doc -->
@@ -23,18 +24,17 @@ import org.eclipse.emf.ecp.view.spi.model.VElement;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement#getLabelObject <em>Label Object
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement#getLabelObject <em>Label
+ * Object</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorizableElement()
  * @model abstract="true"
  * @generated
  */
-public interface VCategorizableElement extends VElement
-{
+public interface VCategorizableElement extends VElement, VHasTooltip {
 
 	/**
 	 * Returns the value of the '<em><b>Label Object</b></em>' reference.
@@ -44,7 +44,7 @@ public interface VCategorizableElement extends VElement
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Label Object</em>' reference.
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorizableElement_LabelObject()
 	 * @model resolveProxies="false" transient="true" changeable="false" volatile="true" derived="true"
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorization.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorization.java
index 93cba48237..163daa877e 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorization.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorization.java
@@ -20,18 +20,17 @@ import org.eclipse.emf.common.util.EList;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization#getCategorizations <em>Categorizations
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization#getCategorizations
+ * <em>Categorizations</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorization()
  * @model
  * @generated
  */
-public interface VCategorization extends VAbstractCategorization
-{
+public interface VCategorization extends VAbstractCategorization {
 	/**
 	 * Returns the value of the '<em><b>Categorizations</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization}.
@@ -41,7 +40,7 @@ public interface VCategorization extends VAbstractCategorization
 	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Categorizations</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorization_Categorizations()
 	 * @model containment="true"
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationElement.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationElement.java
index 6484ed62d5..5a8ab62de6 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationElement.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationElement.java
@@ -21,22 +21,21 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCategorizations <em>
- * Categorizations</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCategorizations
+ * <em>Categorizations</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCurrentSelection <em>Current
  * Selection</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getMainCategoryDepth <em>Main
  * Category Depth</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorizationElement()
  * @model
  * @generated
  */
-public interface VCategorizationElement extends VContainedElement
-{
+public interface VCategorizationElement extends VContainedElement {
 	/**
 	 * Returns the value of the '<em><b>Categorizations</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization}.
@@ -46,7 +45,7 @@ public interface VCategorizationElement extends VContainedElement
 	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Categorizations</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorizationElement_Categorizations()
 	 * @model containment="true"
@@ -62,7 +61,7 @@ public interface VCategorizationElement extends VContainedElement
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Current Selection</em>' reference.
 	 * @see #setCurrentSelection(VCategorizableElement)
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorizationElement_CurrentSelection()
@@ -72,12 +71,12 @@ public interface VCategorizationElement extends VContainedElement
 	VCategorizableElement getCurrentSelection();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCurrentSelection
-	 * <em>Current Selection</em>}' reference.
+	 * Sets the value of the
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCurrentSelection <em>Current
+	 * Selection</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Current Selection</em>' reference.
 	 * @see #getCurrentSelection()
 	 * @generated
@@ -93,7 +92,7 @@ public interface VCategorizationElement extends VContainedElement
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Main Category Depth</em>' attribute.
 	 * @see #setMainCategoryDepth(int)
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategorizationElement_MainCategoryDepth()
@@ -103,12 +102,12 @@ public interface VCategorizationElement extends VContainedElement
 	int getMainCategoryDepth();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getMainCategoryDepth
-	 * <em>Main Category Depth</em>}' attribute.
+	 * Sets the value of the
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getMainCategoryDepth <em>Main
+	 * Category Depth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Main Category Depth</em>' attribute.
 	 * @see #getMainCategoryDepth()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationFactory.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationFactory.java
index c127fcb435..1d8f3fc819 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationFactory.java
@@ -18,17 +18,16 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage
  * @generated
  */
-public interface VCategorizationFactory extends EFactory
-{
+public interface VCategorizationFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	VCategorizationFactory eINSTANCE = org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationFactoryImpl
@@ -38,7 +37,7 @@ public interface VCategorizationFactory extends EFactory
 	 * Returns a new object of class '<em>Categorization</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Categorization</em>'.
 	 * @generated
 	 */
@@ -48,7 +47,7 @@ public interface VCategorizationFactory extends EFactory
 	 * Returns a new object of class '<em>Category</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Category</em>'.
 	 * @generated
 	 */
@@ -58,7 +57,7 @@ public interface VCategorizationFactory extends EFactory
 	 * Returns a new object of class '<em>Action</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Action</em>'.
 	 * @generated
 	 */
@@ -68,7 +67,7 @@ public interface VCategorizationFactory extends EFactory
 	 * Returns a new object of class '<em>Element</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Element</em>'.
 	 * @generated
 	 */
@@ -78,7 +77,7 @@ public interface VCategorizationFactory extends EFactory
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationPackage.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationPackage.java
index a8aadef380..a161be20e6 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategorizationPackage.java
@@ -33,8 +33,7 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  * @model kind="package"
  * @generated
  */
-public interface VCategorizationPackage extends EPackage
-{
+public interface VCategorizationPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
@@ -73,9 +72,9 @@ public interface VCategorizationPackage extends EPackage
 		.init();
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VAbstractCategorizationImpl
-	 * <em>Abstract Categorization</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VAbstractCategorizationImpl <em>Abstract
+	 * Categorization</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -122,8 +121,8 @@ public interface VCategorizationPackage extends EPackage
 	int ACTION = 3;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl <em>Element</em>}'
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl <em>Element</em>}'
 	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -135,9 +134,9 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZATION_ELEMENT = 4;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizableElementImpl
-	 * <em>Categorizable Element</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizableElementImpl <em>Categorizable
+	 * Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -158,6 +157,18 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZABLE_ELEMENT__NAME = VViewPackage.ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZABLE_ELEMENT__LABEL = VViewPackage.ELEMENT__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -208,6 +219,30 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZABLE_ELEMENT__ATTACHMENTS = VViewPackage.ELEMENT__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZABLE_ELEMENT__UUID = VViewPackage.ELEMENT__UUID;
+
+	/**
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZABLE_ELEMENT__TOOLTIP = VViewPackage.ELEMENT_FEATURE_COUNT + 0;
+
+	/**
 	 * The feature id for the '<em><b>Label Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -215,7 +250,7 @@ public interface VCategorizationPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int CATEGORIZABLE_ELEMENT__LABEL_OBJECT = VViewPackage.ELEMENT_FEATURE_COUNT + 0;
+	int CATEGORIZABLE_ELEMENT__LABEL_OBJECT = VViewPackage.ELEMENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Categorizable Element</em>' class.
@@ -225,7 +260,7 @@ public interface VCategorizationPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int CATEGORIZABLE_ELEMENT_FEATURE_COUNT = VViewPackage.ELEMENT_FEATURE_COUNT + 1;
+	int CATEGORIZABLE_ELEMENT_FEATURE_COUNT = VViewPackage.ELEMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -238,6 +273,18 @@ public interface VCategorizationPackage extends EPackage
 	int ABSTRACT_CATEGORIZATION__NAME = CATEGORIZABLE_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_CATEGORIZATION__LABEL = CATEGORIZABLE_ELEMENT__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -288,6 +335,30 @@ public interface VCategorizationPackage extends EPackage
 	int ABSTRACT_CATEGORIZATION__ATTACHMENTS = CATEGORIZABLE_ELEMENT__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_CATEGORIZATION__UUID = CATEGORIZABLE_ELEMENT__UUID;
+
+	/**
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int ABSTRACT_CATEGORIZATION__TOOLTIP = CATEGORIZABLE_ELEMENT__TOOLTIP;
+
+	/**
 	 * The feature id for the '<em><b>Label Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -328,6 +399,18 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZATION__NAME = ABSTRACT_CATEGORIZATION__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZATION__LABEL = ABSTRACT_CATEGORIZATION__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -378,6 +461,30 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZATION__ATTACHMENTS = ABSTRACT_CATEGORIZATION__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZATION__UUID = ABSTRACT_CATEGORIZATION__UUID;
+
+	/**
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZATION__TOOLTIP = ABSTRACT_CATEGORIZATION__TOOLTIP;
+
+	/**
 	 * The feature id for the '<em><b>Label Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -428,6 +535,18 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORY__NAME = ABSTRACT_CATEGORIZATION__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__LABEL = ABSTRACT_CATEGORIZATION__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -478,6 +597,30 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORY__ATTACHMENTS = ABSTRACT_CATEGORIZATION__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__UUID = ABSTRACT_CATEGORIZATION__UUID;
+
+	/**
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORY__TOOLTIP = ABSTRACT_CATEGORIZATION__TOOLTIP;
+
+	/**
 	 * The feature id for the '<em><b>Label Object</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -558,6 +701,18 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZATION_ELEMENT__NAME = VViewPackage.CONTAINED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZATION_ELEMENT__LABEL = VViewPackage.CONTAINED_ELEMENT__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -608,6 +763,18 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZATION_ELEMENT__ATTACHMENTS = VViewPackage.CONTAINED_ELEMENT__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int CATEGORIZATION_ELEMENT__UUID = VViewPackage.CONTAINED_ELEMENT__UUID;
+
+	/**
 	 * The feature id for the '<em><b>Categorizations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -648,9 +815,9 @@ public interface VCategorizationPackage extends EPackage
 	int CATEGORIZATION_ELEMENT_FEATURE_COUNT = VViewPackage.CONTAINED_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization
-	 * <em>Abstract Categorization</em>}'.
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization <em>Abstract
+	 * Categorization</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -661,8 +828,8 @@ public interface VCategorizationPackage extends EPackage
 	EClass getAbstractCategorization();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization#getActions <em>Actions</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization#getActions <em>Actions</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -686,8 +853,8 @@ public interface VCategorizationPackage extends EPackage
 	EClass getCategorization();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization#getCategorizations
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization#getCategorizations
 	 * <em>Categorizations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -712,8 +879,8 @@ public interface VCategorizationPackage extends EPackage
 	EClass getCategory();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategory#getComposite <em>Composite</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategory#getComposite <em>Composite</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -737,8 +904,8 @@ public interface VCategorizationPackage extends EPackage
 	EClass getAction();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getBundle <em>Bundle</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getBundle <em>Bundle</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -750,8 +917,8 @@ public interface VCategorizationPackage extends EPackage
 	EAttribute getAction_Bundle();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getClassName <em>Class Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAction#getClassName <em>Class Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -763,8 +930,8 @@ public interface VCategorizationPackage extends EPackage
 	EAttribute getAction_ClassName();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement <em>Element</em>}'.
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -775,8 +942,8 @@ public interface VCategorizationPackage extends EPackage
 	EClass getCategorizationElement();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCategorizations
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCategorizations
 	 * <em>Categorizations</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -789,9 +956,9 @@ public interface VCategorizationPackage extends EPackage
 	EReference getCategorizationElement_Categorizations();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCurrentSelection
-	 * <em>Current Selection</em>}'.
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getCurrentSelection <em>Current
+	 * Selection</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -803,9 +970,9 @@ public interface VCategorizationPackage extends EPackage
 	EReference getCategorizationElement_CurrentSelection();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getMainCategoryDepth
-	 * <em>Main Category Depth</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement#getMainCategoryDepth <em>Main
+	 * Category Depth</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -817,8 +984,8 @@ public interface VCategorizationPackage extends EPackage
 	EAttribute getCategorizationElement_MainCategoryDepth();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement <em>Categorizable Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement
+	 * <em>Categorizable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -829,9 +996,9 @@ public interface VCategorizationPackage extends EPackage
 	EClass getCategorizableElement();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement#getLabelObject
-	 * <em>Label Object</em>}'.
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement#getLabelObject <em>Label
+	 * Object</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -865,12 +1032,11 @@ public interface VCategorizationPackage extends EPackage
 	 *
 	 * @generated
 	 */
-	interface Literals
-	{
+	interface Literals {
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VAbstractCategorizationImpl
-		 * <em>Abstract Categorization</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VAbstractCategorizationImpl <em>Abstract
+		 * Categorization</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
@@ -890,8 +1056,8 @@ public interface VCategorizationPackage extends EPackage
 		EReference ABSTRACT_CATEGORIZATION__ACTIONS = eINSTANCE.getAbstractCategorization_Actions();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationImpl <em>Categorization</em>}'
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationImpl <em>Categorization</em>}'
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -963,8 +1129,8 @@ public interface VCategorizationPackage extends EPackage
 		EAttribute ACTION__CLASS_NAME = eINSTANCE.getAction_ClassName();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl <em>Element</em>}'
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl <em>Element</em>}'
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -1003,9 +1169,9 @@ public interface VCategorizationPackage extends EPackage
 		EAttribute CATEGORIZATION_ELEMENT__MAIN_CATEGORY_DEPTH = eINSTANCE.getCategorizationElement_MainCategoryDepth();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizableElementImpl
-		 * <em>Categorizable Element</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizableElementImpl <em>Categorizable
+		 * Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategory.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategory.java
index 02b3a60f6a..3f2e67786b 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategory.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/VCategory.java
@@ -20,17 +20,16 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategory#getComposite <em>Composite</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategory()
  * @model
  * @generated
  */
-public interface VCategory extends VAbstractCategorization
-{
+public interface VCategory extends VAbstractCategorization {
 	/**
 	 * Returns the value of the '<em><b>Composite</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -39,7 +38,7 @@ public interface VCategory extends VAbstractCategorization
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Composite</em>' containment reference.
 	 * @see #setComposite(VContainedElement)
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage#getCategory_Composite()
@@ -53,7 +52,7 @@ public interface VCategory extends VAbstractCategorization
 	 * <em>Composite</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Composite</em>' containment reference.
 	 * @see #getComposite()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VAbstractCategorizationImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VAbstractCategorizationImpl.java
index 2b7ba3b52d..fc20d066d3 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VAbstractCategorizationImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VAbstractCategorizationImpl.java
@@ -32,21 +32,20 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VAbstractCategorizationImpl#getActions <em>Actions
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VAbstractCategorizationImpl#getActions
+ * <em>Actions</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public abstract class VAbstractCategorizationImpl extends VCategorizableElementImpl implements VAbstractCategorization
-{
+public abstract class VAbstractCategorizationImpl extends VCategorizableElementImpl implements VAbstractCategorization {
 	/**
 	 * The cached value of the '{@link #getActions() <em>Actions</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getActions()
 	 * @generated
 	 * @ordered
@@ -56,37 +55,33 @@ public abstract class VAbstractCategorizationImpl extends VCategorizableElementI
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected VAbstractCategorizationImpl()
-	{
+	protected VAbstractCategorizationImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VCategorizationPackage.Literals.ABSTRACT_CATEGORIZATION;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EList<VAction> getActions()
-	{
-		if (actions == null)
-		{
+	public EList<VAction> getActions() {
+		if (actions == null) {
 			actions = new EObjectContainmentEList<VAction>(VAction.class, this,
 				VCategorizationPackage.ABSTRACT_CATEGORIZATION__ACTIONS);
 		}
@@ -96,14 +91,12 @@ public abstract class VAbstractCategorizationImpl extends VCategorizableElementI
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case VCategorizationPackage.ABSTRACT_CATEGORIZATION__ACTIONS:
 			return ((InternalEList<?>) getActions()).basicRemove(otherEnd, msgs);
 		}
@@ -113,14 +106,12 @@ public abstract class VAbstractCategorizationImpl extends VCategorizableElementI
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case VCategorizationPackage.ABSTRACT_CATEGORIZATION__ACTIONS:
 			return getActions();
 		}
@@ -130,15 +121,13 @@ public abstract class VAbstractCategorizationImpl extends VCategorizableElementI
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case VCategorizationPackage.ABSTRACT_CATEGORIZATION__ACTIONS:
 			getActions().clear();
 			getActions().addAll((Collection<? extends VAction>) newValue);
@@ -150,14 +139,12 @@ public abstract class VAbstractCategorizationImpl extends VCategorizableElementI
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.ABSTRACT_CATEGORIZATION__ACTIONS:
 			getActions().clear();
 			return;
@@ -168,14 +155,12 @@ public abstract class VAbstractCategorizationImpl extends VCategorizableElementI
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.ABSTRACT_CATEGORIZATION__ACTIONS:
 			return actions != null && !actions.isEmpty();
 		}
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VActionImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VActionImpl.java
index 8fe5001d19..8f27fe2165 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VActionImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VActionImpl.java
@@ -24,21 +24,20 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VActionImpl#getBundle <em>Bundle</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VActionImpl#getClassName <em>Class Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
-{
+public class VActionImpl extends MinimalEObjectImpl.Container implements VAction {
 	/**
 	 * The default value of the '{@link #getBundle() <em>Bundle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getBundle()
 	 * @generated
 	 * @ordered
@@ -49,7 +48,7 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	 * The cached value of the '{@link #getBundle() <em>Bundle</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getBundle()
 	 * @generated
 	 * @ordered
@@ -60,7 +59,7 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	 * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getClassName()
 	 * @generated
 	 * @ordered
@@ -71,7 +70,7 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	 * The cached value of the '{@link #getClassName() <em>Class Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getClassName()
 	 * @generated
 	 * @ordered
@@ -81,95 +80,85 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected VActionImpl()
-	{
+	protected VActionImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VCategorizationPackage.Literals.ACTION;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getBundle()
-	{
+	public String getBundle() {
 		return bundle;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setBundle(String newBundle)
-	{
-		final String oldBundle = bundle;
+	public void setBundle(String newBundle) {
+		String oldBundle = bundle;
 		bundle = newBundle;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VCategorizationPackage.ACTION__BUNDLE, oldBundle,
 				bundle));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getClassName()
-	{
+	public String getClassName() {
 		return className;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setClassName(String newClassName)
-	{
-		final String oldClassName = className;
+	public void setClassName(String newClassName) {
+		String oldClassName = className;
 		className = newClassName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VCategorizationPackage.ACTION__CLASS_NAME,
 				oldClassName, className));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case VCategorizationPackage.ACTION__BUNDLE:
 			return getBundle();
 		case VCategorizationPackage.ACTION__CLASS_NAME:
@@ -181,14 +170,12 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case VCategorizationPackage.ACTION__BUNDLE:
 			setBundle((String) newValue);
 			return;
@@ -202,14 +189,12 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.ACTION__BUNDLE:
 			setBundle(BUNDLE_EDEFAULT);
 			return;
@@ -223,14 +208,12 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.ACTION__BUNDLE:
 			return BUNDLE_EDEFAULT == null ? bundle != null : !BUNDLE_EDEFAULT.equals(bundle);
 		case VCategorizationPackage.ACTION__CLASS_NAME:
@@ -242,17 +225,15 @@ public class VActionImpl extends MinimalEObjectImpl.Container implements VAction
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
-		if (eIsProxy()) {
+	public String toString() {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (bundle: "); //$NON-NLS-1$
 		result.append(bundle);
 		result.append(", className: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizableElementImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizableElementImpl.java
index 60002d0d7f..97ad31c697 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizableElementImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizableElementImpl.java
@@ -11,12 +11,16 @@
  */
 package org.eclipse.emf.ecp.view.spi.categorization.model.impl;
 
+import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecp.view.spi.categorization.model.DerivedAttributeAdapter;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.model.impl.VElementImpl;
 
 /**
@@ -25,16 +29,39 @@ import org.eclipse.emf.ecp.view.spi.model.impl.VElementImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizableElementImpl#getTooltip
+ * <em>Tooltip</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizableElementImpl#getLabelObject <em>Label
  * Object</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public abstract class VCategorizableElementImpl extends VElementImpl implements VCategorizableElement
-{
+public abstract class VCategorizableElementImpl extends VElementImpl implements VCategorizableElement {
+	/**
+	 * The default value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 * @since 1.13
+	 */
+	protected static final String TOOLTIP_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 * @since 1.13
+	 */
+	protected String tooltip = TOOLTIP_EDEFAULT;
 	private final DerivedAttributeAdapter labelAdapter;
 
 	/**
@@ -43,8 +70,7 @@ public abstract class VCategorizableElementImpl extends VElementImpl implements
 	 *
 	 * @generated NOT
 	 */
-	protected VCategorizableElementImpl()
-	{
+	protected VCategorizableElementImpl() {
 		super();
 		labelAdapter = new DerivedAttributeAdapter(this,
 			VCategorizationPackage.Literals.CATEGORIZABLE_ELEMENT__LABEL_OBJECT);
@@ -57,8 +83,7 @@ public abstract class VCategorizableElementImpl extends VElementImpl implements
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VCategorizationPackage.Literals.CATEGORIZABLE_ELEMENT;
 	}
 
@@ -67,10 +92,38 @@ public abstract class VCategorizableElementImpl extends VElementImpl implements
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
+	 * @since 1.13
+	 */
+	@Override
+	public String getTooltip() {
+		return tooltip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @since 1.13
 	 */
 	@Override
-	public EObject getLabelObject()
-	{
+	public void setTooltip(String newTooltip) {
+		final String oldTooltip = tooltip;
+		tooltip = newTooltip;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP,
+				oldTooltip, tooltip));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EObject getLabelObject() {
 		// TODO: implement this method to return the 'Label Object' reference
 		// Ensure that you remove @generated or mark it @generated NOT
 		throw new UnsupportedOperationException();
@@ -83,10 +136,10 @@ public abstract class VCategorizableElementImpl extends VElementImpl implements
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP:
+			return getTooltip();
 		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__LABEL_OBJECT:
 			return getLabelObject();
 		}
@@ -100,16 +153,105 @@ public abstract class VCategorizableElementImpl extends VElementImpl implements
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP:
+			setTooltip((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP:
+			setTooltip(TOOLTIP_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP:
+			return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
 		case VCategorizationPackage.CATEGORIZABLE_ELEMENT__LABEL_OBJECT:
 			return getLabelObject() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == VHasTooltip.class) {
+			switch (derivedFeatureID) {
+			case VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP:
+				return VViewPackage.HAS_TOOLTIP__TOOLTIP;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == VHasTooltip.class) {
+			switch (baseFeatureID) {
+			case VViewPackage.HAS_TOOLTIP__TOOLTIP:
+				return VCategorizationPackage.CATEGORIZABLE_ELEMENT__TOOLTIP;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		final StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (tooltip: "); //$NON-NLS-1$
+		result.append(tooltip);
+		result.append(')');
+		return result.toString();
+	}
+
 	protected void addNavigatedDependencyToLabelAdapter(EStructuralFeature navigationFeature,
 		EStructuralFeature dependantFeature) {
 		labelAdapter.addNavigatedDependency(navigationFeature, dependantFeature);
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationElementImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationElementImpl.java
index ffb5a2c6f4..060ad6d2f5 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationElementImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationElementImpl.java
@@ -33,25 +33,24 @@ import org.eclipse.emf.ecp.view.spi.model.impl.VContainedElementImpl;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl#getCategorizations <em>
- * Categorizations</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl#getCurrentSelection <em>
- * Current Selection</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl#getCategorizations
+ * <em>Categorizations</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl#getCurrentSelection
+ * <em>Current Selection</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationElementImpl#getMainCategoryDepth
  * <em>Main Category Depth</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class VCategorizationElementImpl extends VContainedElementImpl implements VCategorizationElement
-{
+public class VCategorizationElementImpl extends VContainedElementImpl implements VCategorizationElement {
 	/**
 	 * The cached value of the '{@link #getCategorizations() <em>Categorizations</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getCategorizations()
 	 * @generated
 	 * @ordered
@@ -62,7 +61,7 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	 * The cached value of the '{@link #getCurrentSelection() <em>Current Selection</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getCurrentSelection()
 	 * @generated
 	 * @ordered
@@ -73,7 +72,7 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	 * The default value of the '{@link #getMainCategoryDepth() <em>Main Category Depth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getMainCategoryDepth()
 	 * @generated
 	 * @ordered
@@ -84,7 +83,7 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	 * The cached value of the '{@link #getMainCategoryDepth() <em>Main Category Depth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getMainCategoryDepth()
 	 * @generated
 	 * @ordered
@@ -94,37 +93,33 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected VCategorizationElementImpl()
-	{
+	protected VCategorizationElementImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VCategorizationPackage.Literals.CATEGORIZATION_ELEMENT;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EList<VAbstractCategorization> getCategorizations()
-	{
-		if (categorizations == null)
-		{
+	public EList<VAbstractCategorization> getCategorizations() {
+		if (categorizations == null) {
 			categorizations = new EObjectContainmentEList<VAbstractCategorization>(VAbstractCategorization.class, this,
 				VCategorizationPackage.CATEGORIZATION_ELEMENT__CATEGORIZATIONS);
 		}
@@ -134,23 +129,19 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VCategorizableElement getCurrentSelection()
-	{
-		if (currentSelection != null && currentSelection.eIsProxy())
-		{
-			final InternalEObject oldCurrentSelection = (InternalEObject) currentSelection;
+	public VCategorizableElement getCurrentSelection() {
+		if (currentSelection != null && currentSelection.eIsProxy()) {
+			InternalEObject oldCurrentSelection = (InternalEObject) currentSelection;
 			currentSelection = (VCategorizableElement) eResolveProxy(oldCurrentSelection);
-			if (currentSelection != oldCurrentSelection)
-			{
-				if (eNotificationRequired()) {
+			if (currentSelection != oldCurrentSelection) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						VCategorizationPackage.CATEGORIZATION_ELEMENT__CURRENT_SELECTION, oldCurrentSelection,
 						currentSelection));
-				}
 			}
 		}
 		return currentSelection;
@@ -159,72 +150,65 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public VCategorizableElement basicGetCurrentSelection()
-	{
+	public VCategorizableElement basicGetCurrentSelection() {
 		return currentSelection;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setCurrentSelection(VCategorizableElement newCurrentSelection)
-	{
-		final VCategorizableElement oldCurrentSelection = currentSelection;
+	public void setCurrentSelection(VCategorizableElement newCurrentSelection) {
+		VCategorizableElement oldCurrentSelection = currentSelection;
 		currentSelection = newCurrentSelection;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-				VCategorizationPackage.CATEGORIZATION_ELEMENT__CURRENT_SELECTION, oldCurrentSelection, currentSelection));
-		}
+				VCategorizationPackage.CATEGORIZATION_ELEMENT__CURRENT_SELECTION, oldCurrentSelection,
+				currentSelection));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public int getMainCategoryDepth()
-	{
+	public int getMainCategoryDepth() {
 		return mainCategoryDepth;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setMainCategoryDepth(int newMainCategoryDepth)
-	{
-		final int oldMainCategoryDepth = mainCategoryDepth;
+	public void setMainCategoryDepth(int newMainCategoryDepth) {
+		int oldMainCategoryDepth = mainCategoryDepth;
 		mainCategoryDepth = newMainCategoryDepth;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
 				VCategorizationPackage.CATEGORIZATION_ELEMENT__MAIN_CATEGORY_DEPTH, oldMainCategoryDepth,
 				mainCategoryDepth));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__CATEGORIZATIONS:
 			return ((InternalEList<?>) getCategorizations()).basicRemove(otherEnd, msgs);
 		}
@@ -234,20 +218,17 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__CATEGORIZATIONS:
 			return getCategorizations();
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__CURRENT_SELECTION:
-			if (resolve) {
+			if (resolve)
 				return getCurrentSelection();
-			}
 			return basicGetCurrentSelection();
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__MAIN_CATEGORY_DEPTH:
 			return getMainCategoryDepth();
@@ -258,15 +239,13 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__CATEGORIZATIONS:
 			getCategorizations().clear();
 			getCategorizations().addAll((Collection<? extends VAbstractCategorization>) newValue);
@@ -284,14 +263,12 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__CATEGORIZATIONS:
 			getCategorizations().clear();
 			return;
@@ -308,14 +285,12 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__CATEGORIZATIONS:
 			return categorizations != null && !categorizations.isEmpty();
 		case VCategorizationPackage.CATEGORIZATION_ELEMENT__CURRENT_SELECTION:
@@ -329,17 +304,15 @@ public class VCategorizationElementImpl extends VContainedElementImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
-		if (eIsProxy()) {
+	public String toString() {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (mainCategoryDepth: "); //$NON-NLS-1$
 		result.append(mainCategoryDepth);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationFactoryImpl.java
index 06758124f2..f7db91a2a1 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationFactoryImpl.java
@@ -27,30 +27,25 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategory;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class VCategorizationFactoryImpl extends EFactoryImpl implements VCategorizationFactory
-{
+public class VCategorizationFactoryImpl extends EFactoryImpl implements VCategorizationFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static VCategorizationFactory init()
-	{
-		try
-		{
-			final VCategorizationFactory theCategorizationFactory = (VCategorizationFactory) EPackage.Registry.INSTANCE
+	public static VCategorizationFactory init() {
+		try {
+			VCategorizationFactory theCategorizationFactory = (VCategorizationFactory) EPackage.Registry.INSTANCE
 				.getEFactory(VCategorizationPackage.eNS_URI);
-			if (theCategorizationFactory != null)
-			{
+			if (theCategorizationFactory != null) {
 				return theCategorizationFactory;
 			}
-		} catch (final Exception exception)
-		{
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new VCategorizationFactoryImpl();
@@ -60,25 +55,22 @@ public class VCategorizationFactoryImpl extends EFactoryImpl implements VCategor
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public VCategorizationFactoryImpl()
-	{
+	public VCategorizationFactoryImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
 		case VCategorizationPackage.CATEGORIZATION:
 			return createCategorization();
 		case VCategorizationPackage.CATEGORY:
@@ -95,77 +87,71 @@ public class VCategorizationFactoryImpl extends EFactoryImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VCategorization createCategorization()
-	{
-		final VCategorizationImpl categorization = new VCategorizationImpl();
+	public VCategorization createCategorization() {
+		VCategorizationImpl categorization = new VCategorizationImpl();
 		return categorization;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VCategory createCategory()
-	{
-		final VCategoryImpl category = new VCategoryImpl();
+	public VCategory createCategory() {
+		VCategoryImpl category = new VCategoryImpl();
 		return category;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VAction createAction()
-	{
-		final VActionImpl action = new VActionImpl();
+	public VAction createAction() {
+		VActionImpl action = new VActionImpl();
 		return action;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VCategorizationElement createCategorizationElement()
-	{
-		final VCategorizationElementImpl categorizationElement = new VCategorizationElementImpl();
+	public VCategorizationElement createCategorizationElement() {
+		VCategorizationElementImpl categorizationElement = new VCategorizationElementImpl();
 		return categorizationElement;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VCategorizationPackage getCategorizationPackage()
-	{
+	public VCategorizationPackage getCategorizationPackage() {
 		return (VCategorizationPackage) getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
 	@Deprecated
-	public static VCategorizationPackage getPackage()
-	{
+	public static VCategorizationPackage getPackage() {
 		return VCategorizationPackage.eINSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationImpl.java
index a3c784af44..21a2ea3fb0 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationImpl.java
@@ -29,21 +29,20 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationImpl#getCategorizations <em>
- * Categorizations</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategorizationImpl#getCategorizations
+ * <em>Categorizations</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class VCategorizationImpl extends VAbstractCategorizationImpl implements VCategorization
-{
+public class VCategorizationImpl extends VAbstractCategorizationImpl implements VCategorization {
 	/**
 	 * The cached value of the '{@link #getCategorizations() <em>Categorizations</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getCategorizations()
 	 * @generated
 	 * @ordered
@@ -53,37 +52,33 @@ public class VCategorizationImpl extends VAbstractCategorizationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected VCategorizationImpl()
-	{
+	protected VCategorizationImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VCategorizationPackage.Literals.CATEGORIZATION;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EList<VAbstractCategorization> getCategorizations()
-	{
-		if (categorizations == null)
-		{
+	public EList<VAbstractCategorization> getCategorizations() {
+		if (categorizations == null) {
 			categorizations = new EObjectContainmentEList<VAbstractCategorization>(VAbstractCategorization.class, this,
 				VCategorizationPackage.CATEGORIZATION__CATEGORIZATIONS);
 		}
@@ -93,14 +88,12 @@ public class VCategorizationImpl extends VAbstractCategorizationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION__CATEGORIZATIONS:
 			return ((InternalEList<?>) getCategorizations()).basicRemove(otherEnd, msgs);
 		}
@@ -110,14 +103,12 @@ public class VCategorizationImpl extends VAbstractCategorizationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION__CATEGORIZATIONS:
 			return getCategorizations();
 		}
@@ -127,15 +118,13 @@ public class VCategorizationImpl extends VAbstractCategorizationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION__CATEGORIZATIONS:
 			getCategorizations().clear();
 			getCategorizations().addAll((Collection<? extends VAbstractCategorization>) newValue);
@@ -147,14 +136,12 @@ public class VCategorizationImpl extends VAbstractCategorizationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION__CATEGORIZATIONS:
 			getCategorizations().clear();
 			return;
@@ -165,14 +152,12 @@ public class VCategorizationImpl extends VAbstractCategorizationImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORIZATION__CATEGORIZATIONS:
 			return categorizations != null && !categorizations.isEmpty();
 		}
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationPackageImpl.java
index 4e1602af2e..1928282f8b 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategorizationPackageImpl.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VAction;
@@ -31,15 +30,14 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class VCategorizationPackageImpl extends EPackageImpl implements VCategorizationPackage
-{
+public class VCategorizationPackageImpl extends EPackageImpl implements VCategorizationPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass abstractCategorizationEClass = null;
@@ -47,7 +45,7 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass categorizationEClass = null;
@@ -55,7 +53,7 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass categoryEClass = null;
@@ -63,7 +61,7 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass actionEClass = null;
@@ -71,7 +69,7 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass categorizationElementEClass = null;
@@ -79,7 +77,7 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass categorizableElementEClass = null;
@@ -98,15 +96,14 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	 * @see #init()
 	 * @generated
 	 */
-	private VCategorizationPackageImpl()
-	{
+	private VCategorizationPackageImpl() {
 		super(eNS_URI, VCategorizationFactory.eINSTANCE);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -124,16 +121,14 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static VCategorizationPackage init()
-	{
-		if (isInited) {
+	public static VCategorizationPackage init() {
+		if (isInited)
 			return (VCategorizationPackage) EPackage.Registry.INSTANCE.getEPackage(VCategorizationPackage.eNS_URI);
-		}
 
 		// Obtain or create and register package
-		final VCategorizationPackageImpl theCategorizationPackage = (VCategorizationPackageImpl) (EPackage.Registry.INSTANCE
+		VCategorizationPackageImpl theCategorizationPackage = (VCategorizationPackageImpl) (EPackage.Registry.INSTANCE
 			.get(eNS_URI) instanceof VCategorizationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-			: new VCategorizationPackageImpl());
+				: new VCategorizationPackageImpl());
 
 		isInited = true;
 
@@ -157,199 +152,183 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getAbstractCategorization()
-	{
+	public EClass getAbstractCategorization() {
 		return abstractCategorizationEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getAbstractCategorization_Actions()
-	{
+	public EReference getAbstractCategorization_Actions() {
 		return (EReference) abstractCategorizationEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getCategorization()
-	{
+	public EClass getCategorization() {
 		return categorizationEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getCategorization_Categorizations()
-	{
+	public EReference getCategorization_Categorizations() {
 		return (EReference) categorizationEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getCategory()
-	{
+	public EClass getCategory() {
 		return categoryEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getCategory_Composite()
-	{
+	public EReference getCategory_Composite() {
 		return (EReference) categoryEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getAction()
-	{
+	public EClass getAction() {
 		return actionEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EAttribute getAction_Bundle()
-	{
+	public EAttribute getAction_Bundle() {
 		return (EAttribute) actionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EAttribute getAction_ClassName()
-	{
+	public EAttribute getAction_ClassName() {
 		return (EAttribute) actionEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getCategorizationElement()
-	{
+	public EClass getCategorizationElement() {
 		return categorizationElementEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getCategorizationElement_Categorizations()
-	{
+	public EReference getCategorizationElement_Categorizations() {
 		return (EReference) categorizationElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getCategorizationElement_CurrentSelection()
-	{
+	public EReference getCategorizationElement_CurrentSelection() {
 		return (EReference) categorizationElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EAttribute getCategorizationElement_MainCategoryDepth()
-	{
+	public EAttribute getCategorizationElement_MainCategoryDepth() {
 		return (EAttribute) categorizationElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getCategorizableElement()
-	{
+	public EClass getCategorizableElement() {
 		return categorizableElementEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getCategorizableElement_LabelObject()
-	{
+	public EReference getCategorizableElement_LabelObject() {
 		return (EReference) categorizableElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VCategorizationFactory getCategorizationFactory()
-	{
+	public VCategorizationFactory getCategorizationFactory() {
 		return (VCategorizationFactory) getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -359,14 +338,12 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void createPackageContents()
-	{
-		if (isCreated) {
+	public void createPackageContents() {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -395,7 +372,7 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -405,14 +382,12 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void initializePackageContents()
-	{
-		if (isInitialized) {
+	public void initializePackageContents() {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -421,80 +396,62 @@ public class VCategorizationPackageImpl extends EPackageImpl implements VCategor
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		final VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
-		final EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE
-			.getEPackage(EcorePackage.eNS_URI);
+		VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
 
 		// Create type parameters
 
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		abstractCategorizationEClass.getESuperTypes().add(getCategorizableElement());
-		categorizationEClass.getESuperTypes().add(getAbstractCategorization());
-		categoryEClass.getESuperTypes().add(getAbstractCategorization());
+		abstractCategorizationEClass.getESuperTypes().add(this.getCategorizableElement());
+		categorizationEClass.getESuperTypes().add(this.getAbstractCategorization());
+		categoryEClass.getESuperTypes().add(this.getAbstractCategorization());
 		categorizationElementEClass.getESuperTypes().add(theViewPackage.getContainedElement());
 		categorizableElementEClass.getESuperTypes().add(theViewPackage.getElement());
+		categorizableElementEClass.getESuperTypes().add(theViewPackage.getHasTooltip());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(abstractCategorizationEClass, VAbstractCategorization.class,
-			"AbstractCategorization", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getAbstractCategorization_Actions(),
-			getAction(),
-			null,
-			"actions", null, 0, -1, VAbstractCategorization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(categorizationEClass, VCategorization.class,
-			"Categorization", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getCategorization_Categorizations(),
-			getAbstractCategorization(),
-			null,
-			"categorizations", null, 0, -1, VCategorization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(categoryEClass, VCategory.class,
-			"Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getCategory_Composite(),
-			theViewPackage.getContainedElement(),
-			null,
-			"composite", null, 0, 1, VCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(abstractCategorizationEClass, VAbstractCategorization.class, "AbstractCategorization", IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getAbstractCategorization_Actions(), this.getAction(), null, "actions", null, 0, -1, //$NON-NLS-1$
+			VAbstractCategorization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(categorizationEClass, VCategorization.class, "Categorization", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCategorization_Categorizations(), this.getAbstractCategorization(), null, "categorizations", //$NON-NLS-1$
+			null, 0, -1, VCategorization.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(categoryEClass, VCategory.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCategory_Composite(), theViewPackage.getContainedElement(), null, "composite", null, 0, 1, //$NON-NLS-1$
+			VCategory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(actionEClass, VAction.class, "Action", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getAction_Bundle(),
-			ecorePackage.getEString(),
-			"bundle", null, 1, 1, VAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getAction_ClassName(),
-			ecorePackage.getEString(),
-			"className", null, 1, 1, VAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
-		initEClass(categorizationElementEClass, VCategorizationElement.class,
-			"CategorizationElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getCategorizationElement_Categorizations(),
-			getAbstractCategorization(),
-			null,
-			"categorizations", null, 0, -1, VCategorizationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getCategorizationElement_CurrentSelection(),
-			getCategorizableElement(),
-			null,
-			"currentSelection", null, 0, 1, VCategorizationElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getCategorizationElement_MainCategoryDepth(),
-			ecorePackage.getEInt(),
-			"mainCategoryDepth", "0", 0, 1, VCategorizationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
-		initEClass(categorizableElementEClass, VCategorizableElement.class,
-			"CategorizableElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getCategorizableElement_LabelObject(),
-			theEcorePackage.getEObject(),
-			null,
-			"labelObject", null, 0, 1, VCategorizableElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getAction_Bundle(), ecorePackage.getEString(), "bundle", null, 1, 1, VAction.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getAction_ClassName(), ecorePackage.getEString(), "className", null, 1, 1, VAction.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(categorizationElementEClass, VCategorizationElement.class, "CategorizationElement", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCategorizationElement_Categorizations(), this.getAbstractCategorization(), null,
+			"categorizations", null, 0, -1, VCategorizationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCategorizationElement_CurrentSelection(), this.getCategorizableElement(), null,
+			"currentSelection", null, 0, 1, VCategorizationElement.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getCategorizationElement_MainCategoryDepth(), ecorePackage.getEInt(), "mainCategoryDepth", "0", //$NON-NLS-1$ //$NON-NLS-2$
+			0, 1, VCategorizationElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(categorizableElementEClass, VCategorizableElement.class, "CategorizableElement", IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCategorizableElement_LabelObject(), ecorePackage.getEObject(), null, "labelObject", null, 0, //$NON-NLS-1$
+			1, VCategorizableElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE,
+			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategoryImpl.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategoryImpl.java
index 750165d898..0887353419 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/impl/VCategoryImpl.java
@@ -26,20 +26,19 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.categorization.model.impl.VCategoryImpl#getComposite <em>Composite</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class VCategoryImpl extends VAbstractCategorizationImpl implements VCategory
-{
+public class VCategoryImpl extends VAbstractCategorizationImpl implements VCategory {
 	/**
 	 * The cached value of the '{@link #getComposite() <em>Composite</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getComposite()
 	 * @generated
 	 * @ordered
@@ -49,57 +48,51 @@ public class VCategoryImpl extends VAbstractCategorizationImpl implements VCateg
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected VCategoryImpl()
-	{
+	protected VCategoryImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VCategorizationPackage.Literals.CATEGORY;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VContainedElement getComposite()
-	{
+	public VContainedElement getComposite() {
 		return composite;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetComposite(VContainedElement newComposite, NotificationChain msgs)
-	{
-		final VContainedElement oldComposite = composite;
+	public NotificationChain basicSetComposite(VContainedElement newComposite, NotificationChain msgs) {
+		VContainedElement oldComposite = composite;
 		composite = newComposite;
-		if (eNotificationRequired())
-		{
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				VCategorizationPackage.CATEGORY__COMPOSITE, oldComposite, newComposite);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -107,45 +100,36 @@ public class VCategoryImpl extends VAbstractCategorizationImpl implements VCateg
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setComposite(VContainedElement newComposite)
-	{
-		if (newComposite != composite)
-		{
+	public void setComposite(VContainedElement newComposite) {
+		if (newComposite != composite) {
 			NotificationChain msgs = null;
-			if (composite != null) {
-				msgs = ((InternalEObject) composite).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- VCategorizationPackage.CATEGORY__COMPOSITE, null, msgs);
-			}
-			if (newComposite != null) {
-				msgs = ((InternalEObject) newComposite).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- VCategorizationPackage.CATEGORY__COMPOSITE, null, msgs);
-			}
+			if (composite != null)
+				msgs = ((InternalEObject) composite).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - VCategorizationPackage.CATEGORY__COMPOSITE, null, msgs);
+			if (newComposite != null)
+				msgs = ((InternalEObject) newComposite).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - VCategorizationPackage.CATEGORY__COMPOSITE, null, msgs);
 			msgs = basicSetComposite(newComposite, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VCategorizationPackage.CATEGORY__COMPOSITE,
 				newComposite, newComposite));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORY__COMPOSITE:
 			return basicSetComposite(null, msgs);
 		}
@@ -155,14 +139,12 @@ public class VCategoryImpl extends VAbstractCategorizationImpl implements VCateg
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORY__COMPOSITE:
 			return getComposite();
 		}
@@ -172,14 +154,12 @@ public class VCategoryImpl extends VAbstractCategorizationImpl implements VCateg
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORY__COMPOSITE:
 			setComposite((VContainedElement) newValue);
 			return;
@@ -190,14 +170,12 @@ public class VCategoryImpl extends VAbstractCategorizationImpl implements VCateg
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORY__COMPOSITE:
 			setComposite((VContainedElement) null);
 			return;
@@ -208,14 +186,12 @@ public class VCategoryImpl extends VAbstractCategorizationImpl implements VCateg
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case VCategorizationPackage.CATEGORY__COMPOSITE:
 			return composite != null;
 		}
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationAdapterFactory.java
index dee844b120..fb6735f2ed 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationAdapterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategory;
 import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 
 /**
  * <!-- begin-user-doc -->
@@ -34,8 +35,7 @@ import org.eclipse.emf.ecp.view.spi.model.VElement;
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage
  * @generated
  */
-public class CategorizationAdapterFactory extends AdapterFactoryImpl
-{
+public class CategorizationAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
@@ -52,10 +52,8 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 *
 	 * @generated
 	 */
-	public CategorizationAdapterFactory()
-	{
-		if (modelPackage == null)
-		{
+	public CategorizationAdapterFactory() {
+		if (modelPackage == null) {
 			modelPackage = VCategorizationPackage.eINSTANCE;
 		}
 	}
@@ -71,14 +69,11 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public boolean isFactoryForType(Object object)
-	{
-		if (object == modelPackage)
-		{
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject)
-		{
+		if (object instanceof EObject) {
 			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -91,63 +86,57 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 *
 	 * @generated
 	 */
-	protected CategorizationSwitch<Adapter> modelSwitch =
-		new CategorizationSwitch<Adapter>()
-		{
-			@Override
-			public Adapter caseAbstractCategorization(VAbstractCategorization object)
-			{
-				return createAbstractCategorizationAdapter();
-			}
+	protected CategorizationSwitch<Adapter> modelSwitch = new CategorizationSwitch<Adapter>() {
+		@Override
+		public Adapter caseAbstractCategorization(VAbstractCategorization object) {
+			return createAbstractCategorizationAdapter();
+		}
 
-			@Override
-			public Adapter caseCategorization(VCategorization object)
-			{
-				return createCategorizationAdapter();
-			}
+		@Override
+		public Adapter caseCategorization(VCategorization object) {
+			return createCategorizationAdapter();
+		}
 
-			@Override
-			public Adapter caseCategory(VCategory object)
-			{
-				return createCategoryAdapter();
-			}
+		@Override
+		public Adapter caseCategory(VCategory object) {
+			return createCategoryAdapter();
+		}
 
-			@Override
-			public Adapter caseAction(VAction object)
-			{
-				return createActionAdapter();
-			}
+		@Override
+		public Adapter caseAction(VAction object) {
+			return createActionAdapter();
+		}
 
-			@Override
-			public Adapter caseCategorizationElement(VCategorizationElement object)
-			{
-				return createCategorizationElementAdapter();
-			}
+		@Override
+		public Adapter caseCategorizationElement(VCategorizationElement object) {
+			return createCategorizationElementAdapter();
+		}
 
-			@Override
-			public Adapter caseCategorizableElement(VCategorizableElement object)
-			{
-				return createCategorizableElementAdapter();
-			}
+		@Override
+		public Adapter caseCategorizableElement(VCategorizableElement object) {
+			return createCategorizableElementAdapter();
+		}
 
-			@Override
-			public Adapter caseElement(VElement object)
-			{
-				return createElementAdapter();
-			}
+		@Override
+		public Adapter caseElement(VElement object) {
+			return createElementAdapter();
+		}
 
-			@Override
-			public Adapter caseContainedElement(VContainedElement object)
-			{
-				return createContainedElementAdapter();
-			}
+		@Override
+		public Adapter caseHasTooltip(VHasTooltip object) {
+			return createHasTooltipAdapter();
+		}
 
-			@Override
-			public Adapter defaultCase(EObject object)
-			{
-				return createEObjectAdapter();
-			}
-		};
+		@Override
+		public Adapter caseContainedElement(VContainedElement object) {
+			return createContainedElementAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
@@ -159,15 +148,14 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public Adapter createAdapter(Notifier target)
-	{
+	public Adapter createAdapter(Notifier target) {
 		return modelSwitch.doSwitch((EObject) target);
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization
-	 * <em>Abstract Categorization</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization <em>Abstract
+	 * Categorization</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -177,14 +165,13 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization
 	 * @generated
 	 */
-	public Adapter createAbstractCategorizationAdapter()
-	{
+	public Adapter createAbstractCategorizationAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization <em>Categorization</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization <em>Categorization</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -194,8 +181,7 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization
 	 * @generated
 	 */
-	public Adapter createCategorizationAdapter()
-	{
+	public Adapter createCategorizationAdapter() {
 		return null;
 	}
 
@@ -211,8 +197,7 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategory
 	 * @generated
 	 */
-	public Adapter createCategoryAdapter()
-	{
+	public Adapter createCategoryAdapter() {
 		return null;
 	}
 
@@ -228,14 +213,13 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VAction
 	 * @generated
 	 */
-	public Adapter createActionAdapter()
-	{
+	public Adapter createActionAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement <em>Element</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -245,14 +229,13 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement
 	 * @generated
 	 */
-	public Adapter createCategorizationElementAdapter()
-	{
+	public Adapter createCategorizationElementAdapter() {
 		return null;
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement <em>Categorizable Element</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement <em>Categorizable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -262,8 +245,7 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement
 	 * @generated
 	 */
-	public Adapter createCategorizableElementAdapter()
-	{
+	public Adapter createCategorizableElementAdapter() {
 		return null;
 	}
 
@@ -279,8 +261,25 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.model.VElement
 	 * @generated
 	 */
-	public Adapter createElementAdapter()
-	{
+	public Adapter createElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip <em>Has
+	 * Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip
+	 * @generated
+	 */
+	public Adapter createHasTooltipAdapter() {
 		return null;
 	}
 
@@ -296,8 +295,7 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.model.VContainedElement
 	 * @generated
 	 */
-	public Adapter createContainedElementAdapter()
-	{
+	public Adapter createContainedElementAdapter() {
 		return null;
 	}
 
@@ -310,8 +308,7 @@ public class CategorizationAdapterFactory extends AdapterFactoryImpl
 	 * @return the new adapter.
 	 * @generated
 	 */
-	public Adapter createEObjectAdapter()
-	{
+	public Adapter createEObjectAdapter() {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationSwitch.java b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationSwitch.java
index ee62357423..a108ca0652 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationSwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/src/org/eclipse/emf/ecp/view/spi/categorization/model/util/CategorizationSwitch.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategory;
 import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,8 +39,7 @@ import org.eclipse.emf.ecp.view.spi.model.VElement;
  * @see org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage
  * @generated
  */
-public class CategorizationSwitch<T> extends Switch<T>
-{
+public class CategorizationSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
@@ -56,10 +56,8 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 *
 	 * @generated
 	 */
-	public CategorizationSwitch()
-	{
-		if (modelPackage == null)
-		{
+	public CategorizationSwitch() {
+		if (modelPackage == null) {
 			modelPackage = VCategorizationPackage.eINSTANCE;
 		}
 	}
@@ -69,13 +67,12 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
 	@Override
-	protected boolean isSwitchFor(EPackage ePackage)
-	{
+	protected boolean isSwitchFor(EPackage ePackage) {
 		return ePackage == modelPackage;
 	}
 
@@ -89,10 +86,8 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @generated
 	 */
 	@Override
-	protected T doSwitch(int classifierID, EObject theEObject)
-	{
-		switch (classifierID)
-		{
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
 		case VCategorizationPackage.ABSTRACT_CATEGORIZATION: {
 			final VAbstractCategorization abstractCategorization = (VAbstractCategorization) theEObject;
 			T result = caseAbstractCategorization(abstractCategorization);
@@ -103,6 +98,9 @@ public class CategorizationSwitch<T> extends Switch<T>
 				result = caseElement(abstractCategorization);
 			}
 			if (result == null) {
+				result = caseHasTooltip(abstractCategorization);
+			}
+			if (result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -120,6 +118,9 @@ public class CategorizationSwitch<T> extends Switch<T>
 				result = caseElement(categorization);
 			}
 			if (result == null) {
+				result = caseHasTooltip(categorization);
+			}
+			if (result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -137,6 +138,9 @@ public class CategorizationSwitch<T> extends Switch<T>
 				result = caseElement(category);
 			}
 			if (result == null) {
+				result = caseHasTooltip(category);
+			}
+			if (result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -170,6 +174,9 @@ public class CategorizationSwitch<T> extends Switch<T>
 				result = caseElement(categorizableElement);
 			}
 			if (result == null) {
+				result = caseHasTooltip(categorizableElement);
+			}
+			if (result == null) {
 				result = defaultCase(theEObject);
 			}
 			return result;
@@ -191,8 +198,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseAbstractCategorization(VAbstractCategorization object)
-	{
+	public T caseAbstractCategorization(VAbstractCategorization object) {
 		return null;
 	}
 
@@ -208,8 +214,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseCategorization(VCategorization object)
-	{
+	public T caseCategorization(VCategorization object) {
 		return null;
 	}
 
@@ -225,8 +230,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseCategory(VCategory object)
-	{
+	public T caseCategory(VCategory object) {
 		return null;
 	}
 
@@ -242,8 +246,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseAction(VAction object)
-	{
+	public T caseAction(VAction object) {
 		return null;
 	}
 
@@ -259,8 +262,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseCategorizationElement(VCategorizationElement object)
-	{
+	public T caseCategorizationElement(VCategorizationElement object) {
 		return null;
 	}
 
@@ -276,8 +278,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseCategorizableElement(VCategorizableElement object)
-	{
+	public T caseCategorizableElement(VCategorizableElement object) {
 		return null;
 	}
 
@@ -293,8 +294,24 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseElement(VElement object)
-	{
+	public T caseElement(VElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 * @since 1.13
+	 */
+	public T caseHasTooltip(VHasTooltip object) {
 		return null;
 	}
 
@@ -310,8 +327,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseContainedElement(VContainedElement object)
-	{
+	public T caseContainedElement(VContainedElement object) {
 		return null;
 	}
 
@@ -328,8 +344,7 @@ public class CategorizationSwitch<T> extends Switch<T>
 	 * @generated
 	 */
 	@Override
-	public T defaultCase(EObject object)
-	{
+	public T defaultCase(EObject object) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
index 5dcdfeb9cc..3605c0758f 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Categorization SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.categorization.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.categorization.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.categorization.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/categorizationElementTabbedRendererService.xml,OSGI-INF/compositeCategoryTreeRendererService.xml,OSGI-INF/compositeCategoryTabRendererService.xml,OSGI-INF/swtCategorizationElementRendererService.xml,OSGI-INF/swtCategorizationRendererService.xml,OSGI-INF/swtCategoryRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml
index bc0d8db582..823095874f 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractJFaceTreeRenderer.java b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractJFaceTreeRenderer.java
index 862472ec65..82633f1099 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractJFaceTreeRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractJFaceTreeRenderer.java
@@ -9,7 +9,7 @@
  * Contributors:
  * Edagr Mueller - initial API and implementation
  * Eugen Neufeld - Refactoring
- * Johannes Falterimeier - Refactoring
+ * Johannes Faltermeier - Refactoring
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.spi.categorization.swt;
 
@@ -28,8 +28,11 @@ import org.eclipse.emf.ecp.view.internal.categorization.swt.Activator;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizableElement;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationElement;
+import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorizationPackage.Literals;
 import org.eclipse.emf.ecp.view.spi.categorization.model.VCategory;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.ModelChangeListener;
+import org.eclipse.emf.ecp.view.spi.model.ModelChangeNotification;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.reporting.StatusReport;
 import org.eclipse.emf.ecp.view.spi.renderer.NoPropertyDescriptorFoundExeption;
@@ -297,9 +300,12 @@ public abstract class AbstractJFaceTreeRenderer<VELEMENT extends VElement> exten
 		treeViewer.setContentProvider(contentProvider);
 		treeViewer.setLabelProvider(treeTableLabelProvider);
 
-		treeViewer.addSelectionChangedListener(new TreeSelectionChangedListener(getViewModelContext(), editorComposite,
+		final AbstractJFaceTreeRenderer<VELEMENT>.TreeSelectionChangedListener treeSelectionChangedListener = new TreeSelectionChangedListener(
+			getViewModelContext(), editorComposite,
 			getCategorizationElement(),
-			treeViewer, editors));
+			treeViewer, editors);
+		treeViewer.addSelectionChangedListener(treeSelectionChangedListener);
+		getViewModelContext().registerViewChangeListener(treeSelectionChangedListener);
 
 		addTreeEditor(treeViewer, getVElement(), editors);
 
@@ -326,7 +332,9 @@ public abstract class AbstractJFaceTreeRenderer<VELEMENT extends VElement> exten
 
 		treeViewer.setInput(getVElement());
 		treeViewer.expandAll();
-		if (getCategorizations().size() != 0) {
+		if (getCategorizationElement().getCurrentSelection() != null) {
+			treeViewer.setSelection(new StructuredSelection(getCategorizationElement().getCurrentSelection()));
+		} else if (getCategorizations().size() != 0) {
 			treeViewer.setSelection(new StructuredSelection(getCategorizations().get(0)));
 		}
 	}
@@ -458,7 +466,7 @@ public abstract class AbstractJFaceTreeRenderer<VELEMENT extends VElement> exten
 	 * @author Jonas Helming
 	 *
 	 */
-	private final class TreeSelectionChangedListener implements ISelectionChangedListener {
+	private final class TreeSelectionChangedListener implements ISelectionChangedListener, ModelChangeListener {
 		private final ViewModelContext viewModelContext;
 		private final ScrolledComposite editorComposite;
 		private final VCategorizationElement vCategorizationElement;
@@ -466,6 +474,8 @@ public abstract class AbstractJFaceTreeRenderer<VELEMENT extends VElement> exten
 		private final List<TreeEditor> editors;
 		private Composite childComposite;
 
+		private boolean busy;
+
 		private TreeSelectionChangedListener(ViewModelContext viewModelContext,
 			ScrolledComposite editorComposite, VCategorizationElement vCategorizationElement, TreeViewer treeViewer,
 			List<TreeEditor> editors) {
@@ -486,50 +496,80 @@ public abstract class AbstractJFaceTreeRenderer<VELEMENT extends VElement> exten
 			if (selection == null) {
 				return;
 			}
-			if (childComposite != null) {
-				childComposite.dispose();
-				childComposite = null;
-			}
-			childComposite = createComposite(editorComposite);
+			onSelectionChanged(VElement.class.cast(selection));
+		}
 
-			childComposite.setBackground(editorComposite.getBackground());
-			editorComposite.setContent(childComposite);
+		public void onSelectionChanged(VElement child) {
+
+			if (busy) {
+				return;
+			}
 
-			final VElement child = (VElement) selection;
+			busy = true;
 			try {
+				if (childComposite != null) {
+					childComposite.dispose();
+					childComposite = null;
+				}
+				childComposite = createComposite(editorComposite);
+
+				childComposite.setBackground(editorComposite.getBackground());
+				editorComposite.setContent(childComposite);
 
-				AbstractSWTRenderer<VElement> renderer;
 				try {
-					renderer = getEMFFormsRendererFactory().getRendererInstance(child,
-						viewModelContext);
-				} catch (final EMFFormsNoRendererException ex) {
-					getReportService().report(
-						new StatusReport(
-							new Status(IStatus.INFO, Activator.PLUGIN_ID, String.format(
-								"No Renderer for %s found.", child.eClass().getName(), ex)))); //$NON-NLS-1$
-					return;
+
+					AbstractSWTRenderer<VElement> renderer;
+					try {
+						renderer = getEMFFormsRendererFactory().getRendererInstance(child,
+							viewModelContext);
+					} catch (final EMFFormsNoRendererException ex) {
+						getReportService().report(
+							new StatusReport(
+								new Status(IStatus.INFO, Activator.PLUGIN_ID, String.format(
+									"No Renderer for %s found.", child.eClass().getName(), ex)))); //$NON-NLS-1$
+						return;
+					}
+					// we have a VCategory-> thus only one element in the grid
+					final Control render = renderer.render(
+						renderer.getGridDescription(GridDescriptionFactory.INSTANCE.createEmptyGridDescription())
+							.getGrid()
+							.get(0),
+						childComposite);
+					renderer.finalizeRendering(childComposite);
+					GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true)
+						.minSize(SWT.DEFAULT, 200)
+						.applyTo(render);
+					vCategorizationElement.setCurrentSelection((VCategorizableElement) child);
+				} catch (final NoRendererFoundException e) {
+					getReportService().report(new RenderingFailedReport(e));
+				} catch (final NoPropertyDescriptorFoundExeption e) {
+					getReportService().report(new RenderingFailedReport(e));
 				}
-				// we have a VCategory-> thus only one element in the grid
-				final Control render = renderer.render(
-					renderer.getGridDescription(GridDescriptionFactory.INSTANCE.createEmptyGridDescription()).getGrid()
-						.get(0),
-					childComposite);
-				renderer.finalizeRendering(childComposite);
-				GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true)
-					.minSize(SWT.DEFAULT, 200)
-					.applyTo(render);
-				vCategorizationElement.setCurrentSelection((VCategorizableElement) child);
-			} catch (final NoRendererFoundException e) {
-				getReportService().report(new RenderingFailedReport(e));
-			} catch (final NoPropertyDescriptorFoundExeption e) {
-				getReportService().report(new RenderingFailedReport(e));
+
+				childComposite.layout();
+				final Point point = childComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+				editorComposite.setMinSize(point);
+
+			} finally {
+				busy = false;
 			}
 
-			childComposite.layout();
-			final Point point = childComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-			editorComposite.setMinSize(point);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.emf.ecp.view.spi.model.ModelChangeListener#notifyChange(org.eclipse.emf.ecp.view.spi.model.ModelChangeNotification)
+		 */
+		@Override
+		public void notifyChange(ModelChangeNotification notification) {
+			if (notification.getNotifier() instanceof VCategorizationElement
+				&& notification.getStructuralFeature() == Literals.CATEGORIZATION_ELEMENT__CURRENT_SELECTION) {
+				onSelectionChanged((VElement) notification.getNotifier());
+			}
 
 		}
+
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java
index 8819700a31..d2d8436999 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/AbstractSWTTabRenderer.java
@@ -35,6 +35,7 @@ import org.eclipse.emf.ecp.view.template.model.VTStyleProperty;
 import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
 import org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emfforms.common.Optional;
 import org.eclipse.emfforms.spi.common.report.ReportService;
 import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
@@ -142,11 +143,20 @@ public abstract class AbstractSWTTabRenderer<VELEMENT extends VElement> extends
 			categorizationToItemMap.put(categorization, item);
 			itemToCompositeMap.put(item, composite);
 
-			final IObservableValue modelValue = EMFEditObservables.observeValue(
-				AdapterFactoryEditingDomain.getEditingDomainFor(categorization), categorization,
+			final EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(categorization);
+			final IObservableValue modelLabelValue = EMFEditObservables.observeValue(
+				editingDomain,
+				categorization,
 				VViewPackage.eINSTANCE.getElement_Label());
-			final IObservableValue targetValue = WidgetProperties.text().observe(item);
-			dataBindingContext.bindValue(targetValue, modelValue);
+			final IObservableValue targetLabelValue = WidgetProperties.text().observe(item);
+			dataBindingContext.bindValue(targetLabelValue, modelLabelValue);
+
+			final IObservableValue modelTooltipValue = EMFEditObservables.observeValue(
+				editingDomain,
+				categorization,
+				VViewPackage.eINSTANCE.getHasTooltip_Tooltip());
+			final IObservableValue targetTooltipValue = WidgetProperties.tooltipText().observe(item);
+			dataBindingContext.bindValue(targetTooltipValue, modelTooltipValue);
 
 			if (!renderLazy()) {
 				renderItem(item);
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java
index b18a0d14fd..f72d51c1df 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/spi/categorization/swt/SWTCategorizationRenderer.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecp.view.spi.renderer.NoPropertyDescriptorFoundExeption;
 import org.eclipse.emf.ecp.view.spi.renderer.NoRendererFoundException;
 import org.eclipse.emf.ecp.view.spi.swt.layout.LayoutProviderHelper;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emfforms.spi.common.report.ReportService;
 import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
 import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
@@ -116,13 +117,24 @@ public class SWTCategorizationRenderer extends AbstractSWTRenderer<VCategorizati
 		final Label whatToDoLbl = new Label(categoryComposite, SWT.NONE);
 		whatToDoLbl.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_categorization_message"); //$NON-NLS-1$
 
-		final IObservableValue modelValue = EMFEditObservables.observeValue(
-			AdapterFactoryEditingDomain.getEditingDomainFor(getVElement()), getVElement(),
+		final EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(getVElement());
+		final IObservableValue modelLabelValue = EMFEditObservables.observeValue(
+			editingDomain,
+			getVElement(),
 			VViewPackage.eINSTANCE.getElement_Label());
-		final IObservableValue targetValue = WidgetProperties.text().observe(headingLbl);
-		dataBindingContext.bindValue(targetValue, modelValue);
+		final IObservableValue targetLabelValue = WidgetProperties.text().observe(headingLbl);
+		dataBindingContext.bindValue(targetLabelValue, modelLabelValue);
 
-		whatToDoLbl.setText(LocalizationServiceHelper.getString(getClass(), MessageKeys.Categorization_Selection));
+		final IObservableValue modelTooltipValue = EMFEditObservables.observeValue(
+			editingDomain,
+			getVElement(),
+			VViewPackage.eINSTANCE.getHasTooltip_Tooltip());
+		final IObservableValue targetTooltipValue = WidgetProperties.tooltipText().observe(headingLbl);
+
+		dataBindingContext.bindValue(targetTooltipValue, modelTooltipValue);
+
+		whatToDoLbl.setText(
+			LocalizationServiceHelper.getString(SWTCategorizationRenderer.class, MessageKeys.Categorization_Selection));
 		SWTDataElementIdHelper.setElementIdDataWithSubId(categoryComposite, getVElement(), "category", //$NON-NLS-1$
 			getViewModelContext());
 		return categoryComposite;
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
index 5843dc2e99..8323095e86 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider.HorizontalEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml
index 0d591be700..66f6630160 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
index 89b2cf871a..7a4eb8c4bb 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml
index 168b405382..7cf9c0ac08 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
index e337554bf6..2056abe4d0 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compound Control SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml
index 1a175e9663..9920cd618c 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF
index 4fe072e356..c7f50a91ea 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compound Control Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.tooling;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml
index 4f5a0c9bc8..f70a83e37b 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
index 7fb174af8a..6aa0ca0269 100644
--- a/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Locale View Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.locale;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml b/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml
index 185311c6e9..6cf71c9b67 100644
--- a/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.context.locale</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
index 0723f61452..498af4f067 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Context
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.context;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.context.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.context;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.context;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.common;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.context/pom.xml b/bundles/org.eclipse.emf.ecp.view.context/pom.xml
index 44d9104f97..cb863256a6 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.context/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
index 0d8041fb25..f7cd492969 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Multireference
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.emf.ecp.view.control.multireference/OSGI-INF/l10n/bundle.properties
index 7c583320aa..56e47fc53f 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,5 @@
 MultiReferenceSWTRenderer_addExistingTooltip=Link
 MultiReferenceSWTRenderer_addNewTooltip=Create and link
-MultiReferenceSWTRenderer_deleteTooltip=Delete
\ No newline at end of file
+MultiReferenceSWTRenderer_deleteTooltip=Delete
+MultiReferenceSWTRenderer_moveUpTooltip=Move Up
+MultiReferenceSWTRenderer_moveDownTooltip=Move Down
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/icons/move_down.png b/bundles/org.eclipse.emf.ecp.view.control.multireference/icons/move_down.png
new file mode 100644
index 0000000000..2c4e279377
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/icons/move_down.png
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/icons/move_up.png b/bundles/org.eclipse.emf.ecp.view.control.multireference/icons/move_up.png
new file mode 100644
index 0000000000..1ebb193243
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/icons/move_up.png
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml b/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml
index 16415675dc..afca94dccc 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MessageKeys.java b/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MessageKeys.java
index 655df24cd2..1f33a55ba0 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MessageKeys.java
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MessageKeys.java
@@ -26,5 +26,16 @@ public interface MessageKeys {
 	 * Add New Tooltip.
 	 */
 	String MultiReferenceSWTRenderer_addNewTooltip = "MultiReferenceSWTRenderer_addNewTooltip"; //$NON-NLS-1$
+	/**
+	 * Delete Tooltip.
+	 */
 	String MultiReferenceSWTRenderer_deleteTooltip = "MultiReferenceSWTRenderer_deleteTooltip"; //$NON-NLS-1$
+	/**
+	 * Move Up Tooltip.
+	 */
+	String MultiReferenceSWTRenderer_moveUpTooltip = "MultiReferenceSWTRenderer_moveUpTooltip"; //$NON-NLS-1$
+	/**
+	 * Move Down Tooltip.
+	 */
+	String MultiReferenceSWTRenderer_moveDownTooltip = "MultiReferenceSWTRenderer_moveDownTooltip"; //$NON-NLS-1$
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java
index 71f2a233a9..1702724867 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceSWTRenderer.java
@@ -14,6 +14,7 @@
 package org.eclipse.emf.ecp.view.internal.control.multireference;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -23,6 +24,7 @@ import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
@@ -41,6 +43,7 @@ import org.eclipse.emf.ecp.view.spi.renderer.NoRendererFoundException;
 import org.eclipse.emf.ecp.view.spi.swt.reporting.RenderingFailedReport;
 import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
 import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emf.edit.command.MoveCommand;
 import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -100,6 +103,8 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 	private static final String ICON_ADD_EXISTING = "icons/link.png"; //$NON-NLS-1$
 	private static final String ICON_ADD_NEW = "icons/link_add.png"; //$NON-NLS-1$
 	private static final String ICON_DELETE = "icons/unset_reference.png"; //$NON-NLS-1$
+	private static final String ICON_MOVE_DOWN = "icons/move_down.png"; //$NON-NLS-1$
+	private static final String ICON_MOVE_UP = "icons/move_up.png"; //$NON-NLS-1$
 
 	private final ImageRegistryService imageRegistryService;
 
@@ -137,6 +142,8 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 	private Button btnAddExisting;
 	private Button btnAddNew;
 	private Button btnDelete;
+	private Button btnMoveUp;
+	private Button btnMoveDown;
 
 	/**
 	 * {@inheritDoc}
@@ -176,6 +183,38 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 	}
 
 	/**
+	 * Returns true if the 'MoveUp' button is shown, false otherwise.
+	 *
+	 * @return true if the 'MoveUp' button is shown, false otherwise
+	 */
+	protected boolean showMoveUpButton() {
+		return false;
+	}
+
+	/**
+	 * Returns true if the 'MoveDown' button is shown, false otherwise.
+	 *
+	 * @return true if the 'MoveDown' button is shown, false otherwise
+	 */
+	protected boolean showMoveDownButton() {
+		return false;
+	}
+
+	/**
+	 * Returns the observed {@link EStructuralFeature}.
+	 *
+	 * @return the observed {@link EStructuralFeature}.
+	 * @throws DatabindingFailedException when databinding fails.
+	 */
+	protected EStructuralFeature getEStructuralFeature() throws DatabindingFailedException {
+		final IObservableValue observableValue = getEMFFormsDatabinding()
+			.getObservableValue(getVElement().getDomainModelReference(), getViewModelContext().getDomainModel());
+		final EStructuralFeature structuralFeature = (EStructuralFeature) observableValue.getValueType();
+		observableValue.dispose();
+		return structuralFeature;
+	}
+
+	/**
 	 * {@inheritDoc}
 	 *
 	 * @see org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer#renderControl(org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell,
@@ -300,6 +339,68 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 	}
 
 	/**
+	 * Creates a button that enables reordering the references by the given {@link EStructuralFeature}.
+	 *
+	 * @param parent The parent of the created {@link Button}
+	 * @param structuralFeature The {@link EStructuralFeature} which's references are moved up.
+	 * @return The newly created {@link Button}
+	 */
+	protected Button createMoveUpButton(Composite parent, final EStructuralFeature structuralFeature) {
+		final Button btnMoveUp = new Button(parent, SWT.PUSH);
+		GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(btnMoveUp);
+		btnMoveUp.setImage(getImage(ICON_MOVE_UP));
+		btnMoveUp.setToolTipText(LocalizationServiceHelper.getString(MultiReferenceSWTRenderer.class,
+			MessageKeys.MultiReferenceSWTRenderer_moveUpTooltip));
+		btnMoveUp.addSelectionListener(new SelectionAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 *
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 */
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				super.widgetSelected(e);
+				handleMoveUp(tableViewer, container, structuralFeature);
+				updateButtonEnabling();
+			}
+
+		});
+		return btnMoveUp;
+	}
+
+	/**
+	 * Creates a button that enables reordering the references by the given {@link EStructuralFeature}.
+	 *
+	 * @param parent The parent of the created {@link Button}
+	 * @param structuralFeature The {@link EStructuralFeature} which's references are moved down.
+	 * @return The newly created {@link Button}
+	 */
+	protected Button createMoveDownButton(Composite parent, final EStructuralFeature structuralFeature) {
+		final Button btnMoveDown = new Button(parent, SWT.PUSH);
+		GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(btnMoveDown);
+		btnMoveDown.setImage(getImage(ICON_MOVE_DOWN));
+		btnMoveDown.setToolTipText(LocalizationServiceHelper.getString(MultiReferenceSWTRenderer.class,
+			MessageKeys.MultiReferenceSWTRenderer_moveDownTooltip));
+		btnMoveDown.addSelectionListener(new SelectionAdapter() {
+
+			/**
+			 * {@inheritDoc}
+			 *
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 */
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				super.widgetSelected(e);
+				handleMoveDown(tableViewer, container, structuralFeature);
+				updateButtonEnabling();
+			}
+
+		});
+		return btnMoveDown;
+	}
+
+	/**
 	 * Creates a button that enables the addition of existing references to the given {@link EStructuralFeature}.
 	 *
 	 * @param parent The parent of the created {@link Button}
@@ -391,12 +492,18 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 	}
 
 	/**
-	 * Updates the 'addExisting', 'addNew' and 'delete' buttons according to the bound input.
+	 * Updates the 'addExisting', 'addNew', 'delete', 'moveUp' and 'moveDown' buttons according to the bound input.
 	 */
 	protected void updateButtonEnabling() {
 		final boolean isReadOnly = getVElement().isReadonly();
-		final boolean isEmptyList = tableViewerInputList == null || tableViewerInputList.isEmpty();
+		final int listSize = tableViewerInputList != null ? tableViewerInputList.size() : 0;
 
+		if (showMoveUpButton()) {
+			btnMoveUp.setEnabled(!isReadOnly && listSize > 1);
+		}
+		if (showMoveDownButton()) {
+			btnMoveDown.setEnabled(!isReadOnly && listSize > 1);
+		}
 		if (showAddExistingButton()) {
 			btnAddExisting.setEnabled(!isReadOnly);
 		}
@@ -404,7 +511,7 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 			btnAddNew.setEnabled(!isReadOnly);
 		}
 		if (showDeleteButton()) {
-			btnDelete.setEnabled(!isReadOnly && !isEmptyList);
+			btnDelete.setEnabled(!isReadOnly && listSize > 0);
 		}
 	}
 
@@ -426,6 +533,14 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 
 		int nrButtons = 0;
 
+		if (showMoveUpButton()) {
+			btnMoveUp = createMoveUpButton(buttonComposite, structuralFeature);
+			nrButtons++;
+		}
+		if (showMoveDownButton()) {
+			btnMoveDown = createMoveDownButton(buttonComposite, structuralFeature);
+			nrButtons++;
+		}
 		if (showAddExistingButton()) {
 			btnAddExisting = createAddExistingButton(buttonComposite, structuralFeature);
 			nrButtons++;
@@ -650,6 +765,55 @@ public class MultiReferenceSWTRenderer extends AbstractControlSWTRenderer<VContr
 	}
 
 	/**
+	 * Method for moving up elements.
+	 *
+	 * @param tableViewer the {@link TableViewer}
+	 * @param eObject The {@link EObject} to delete from
+	 * @param structuralFeature The corresponding {@link EStructuralFeature}
+	 */
+	protected void handleMoveUp(TableViewer tableViewer, EObject eObject, EStructuralFeature structuralFeature) {
+		final List<?> moveUpList = IStructuredSelection.class.cast(tableViewer.getSelection()).toList();
+		final EditingDomain editingDomain = getEditingDomain(eObject);
+
+		for (final Object moveUpObject : moveUpList) {
+			final int currentIndex = EList.class.cast(eObject.eGet(structuralFeature)).indexOf(moveUpObject);
+			if (currentIndex <= 0) {
+				return;
+			}
+			editingDomain.getCommandStack()
+				.execute(
+					new MoveCommand(editingDomain, eObject, structuralFeature, currentIndex, currentIndex - 1));
+		}
+	}
+
+	/**
+	 * Method for moving down elements.
+	 *
+	 * @param tableViewer the {@link TableViewer}
+	 * @param eObject The {@link EObject} to delete from
+	 * @param structuralFeature The corresponding {@link EStructuralFeature}
+	 */
+	protected void handleMoveDown(TableViewer tableViewer, EObject eObject, EStructuralFeature structuralFeature) {
+		final List<?> moveDownList = IStructuredSelection.class.cast(tableViewer.getSelection()).toList();
+		final EditingDomain editingDomain = getEditingDomain(eObject);
+
+		// need to reverse to avoid the moves interfering each other
+		Collections.reverse(moveDownList);
+
+		for (final Object moveDownObject : moveDownList) {
+			final int maxIndex = EList.class.cast(eObject.eGet(structuralFeature)).size() - 1;
+			final int currentIndex = EList.class.cast(eObject.eGet(structuralFeature)).indexOf(moveDownObject);
+			if (currentIndex < 0 || currentIndex == maxIndex) {
+				return;
+
+			}
+			editingDomain.getCommandStack()
+				.execute(
+					new MoveCommand(editingDomain, eObject, structuralFeature, currentIndex, currentIndex + 1));
+		}
+	}
+
+	/**
 	 * The {@link ViewerComparator} for this table which allows 3 states for sort order:
 	 * none, up and down.
 	 *
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
index a1ed7f76bb..0e24852fe8 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
@@ -2,37 +2,37 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Core SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.core.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.spi.core.swt;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.spi.core.swt;version="1.13.0";
   uses:="org.eclipse.emf.ecp.ui.view.swt.internal,
    org.eclipse.emf.ecp.view.spi.model,
    org.eclipse.swt.widgets,
    org.eclipse.emf.ecp.view.spi.context",
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.12.0"
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/booleanControlService.xml,OSGI-INF/dateTimeControlService.xml,OSGI-INF/enumControlService.xml,OSGI-INF/numberControlService.xml,OSGI-INF/textControlService.xml,OSGI-INF/xmlDateControlService.xml,OSGI-INF/viewRendererService.xml,OSGI-INF/linkControlService.xml
+Service-Component: OSGI-INF/booleanControlService.xml,OSGI-INF/dateTimeControlService.xml,OSGI-INF/enumControlService.xml,OSGI-INF/numberControlService.xml,OSGI-INF/textControlService.xml,OSGI-INF/xmlDateControlService.xml,OSGI-INF/viewRendererService.xml,OSGI-INF/linkControlService.xml,OSGI-INF/enumLiteralFilteredControlService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/OSGI-INF/enumLiteralFilteredControlService.xml b/bundles/org.eclipse.emf.ecp.view.core.swt/OSGI-INF/enumLiteralFilteredControlService.xml
new file mode 100644
index 0000000000..df80998549
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/OSGI-INF/enumLiteralFilteredControlService.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emf.ecp.view.core.swt.enumLiteralFiltered">
+   <implementation class="org.eclipse.emf.ecp.view.internal.core.swt.renderer.EnumLiteralFilteredComboViewerSWTRendererService"/>
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+   </service>
+   <reference bind="setEMFFormsDatabinding" cardinality="1..1" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" name="EMFFormsDatabinding" policy="static" />
+   <reference bind="setReportService" cardinality="1..1" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService" policy="static" />
+</scr:component>
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml
index 5dfe970c4a..bb743f151a 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/MatchItemComboViewer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/MatchItemComboViewer.java
new file mode 100644
index 0000000000..76eea9d3d3
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/MatchItemComboViewer.java
@@ -0,0 +1,239 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.core.swt;
+
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A {@link ComboViewer} that allows typed text to be matched against
+ * the combo viewer's items and also allows setting the selection via arrow keys.
+ *
+ */
+public class MatchItemComboViewer extends ComboViewer {
+
+	private static final int TIMEOUT = 1000;
+	private long lastKeyPressMillis = -1;
+	private final StringBuffer searchBuffer;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param combo the {@link CCombo} to be wrapped
+	 */
+	public MatchItemComboViewer(CCombo combo) {
+		super(combo);
+		searchBuffer = new StringBuffer();
+		init();
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param area the parent {@link Composite}
+	 * @param style SWT style bits
+	 */
+	public MatchItemComboViewer(Composite area, int style) {
+		super(area, style);
+		searchBuffer = new StringBuffer();
+		init();
+	}
+
+	/**
+	 * Callback that is called when the enter key is released.
+	 * By default, this method sets the selection to be the one
+	 * that matches the text within the combo, ignoring the given
+	 * parameter.
+	 *
+	 * @param selectedIndex the index of the item that is the closest match
+	 */
+	public void onEnter(int selectedIndex) {
+		setClosestMatch(getCCombo().getText());
+	}
+
+	/**
+	 * Initializes this viewer.
+	 */
+	protected void init() {
+		getCCombo().addKeyListener(new MatchItemKeyAdapter());
+		getCCombo().addFocusListener(new FocusListener() {
+			@Override
+			public void focusLost(FocusEvent e) {
+				// reset buffer when focus has been lost
+				resetBuffer();
+			}
+
+			@Override
+			public void focusGained(FocusEvent e) {
+			}
+		});
+	}
+
+	/**
+	 * Returns the index of the closest match.
+	 *
+	 * @param str the String to be matched
+	 * @return the index of the closest match
+	 */
+	public int getClosestMatchIndex(String str) {
+		final String[] cItems = getCCombo().getItems();
+		// Find Item in Combo Items. If full match returns index
+		for (int i = 0; i < cItems.length; i++) {
+			if (cItems[i].toLowerCase().startsWith(str.toLowerCase())) {
+				return i;
+			}
+		}
+
+		return -1;
+	}
+
+	/**
+	 * Set the closest match based on the given String.
+	 *
+	 * @param s the String the closest match should be selected by
+	 */
+	protected void setClosestMatch(String s) {
+		final CCombo combo = getCCombo();
+		final String[] comboItems = combo.getItems();
+		final int index = getClosestMatchIndex(s);
+		if (index != -1) {
+			final String item = comboItems[index];
+			final Point pt = combo.getSelection();
+			combo.select(index);
+			combo.setText(item);
+			combo.setSelection(new Point(pt.x, item.length()));
+		}
+	}
+
+	/**
+	 * Whether the key press timeout has been hit.
+	 *
+	 * @return {@code true}, if the timeout has been hit, {@code false} otherwise
+	 */
+	protected boolean keyPressTimedOut() {
+		long timeElapsed = -1;
+		if (lastKeyPressMillis > 0) {
+			timeElapsed = System.currentTimeMillis() - lastKeyPressMillis;
+		}
+		return timeElapsed != -1 && timeElapsed > TIMEOUT;
+	}
+
+	/**
+	 * Reset the key pressed timer.
+	 */
+	public void resetKeyPressedTimer() {
+		lastKeyPressMillis = -1;
+	}
+
+	/**
+	 * Reset the key pressed timeout.
+	 */
+	protected void resetKeyPressedTimeout() {
+		lastKeyPressMillis = System.currentTimeMillis();
+	}
+
+	/**
+	 * Append a character to the search buffer.
+	 *
+	 * @param character the {@link Character} to be appended
+	 */
+	public void addToBuffer(Character character) {
+		searchBuffer.append(Character.toString(character));
+	}
+
+	/**
+	 * Removes the last character from the search buffer.
+	 */
+	private void removeLastFromBuffer() {
+		searchBuffer.deleteCharAt(searchBuffer.length() - 1);
+	}
+
+	/**
+	 * Clears the search buffer.
+	 */
+	public void resetBuffer() {
+		searchBuffer.setLength(0);
+	}
+
+	/**
+	 * Whether the search buffer is empty.
+	 *
+	 * @return {@code true}, in case the buffer is empty, {@code false} otherwise
+	 */
+	public boolean isEmptyBuffer() {
+		return searchBuffer.length() == 0;
+	}
+
+	/**
+	 * Returns the search buffer as a string.
+	 *
+	 * @return the string representation of the buffer
+	 */
+	private String bufferAsString() {
+		return searchBuffer.toString();
+	}
+
+	/**
+	 * Key adapter for matching typed in text and selecting the closest match.
+	 *
+	 */
+	class MatchItemKeyAdapter extends KeyAdapter {
+		@Override
+		public void keyReleased(KeyEvent keyEvent) {
+			if (keyEvent.keyCode == SWT.CR) {
+				keyEvent.doit = true;
+				final int selectedIndex = getClosestMatchIndex(bufferAsString());
+				onEnter(selectedIndex);
+				resetBuffer();
+				resetKeyPressedTimer();
+			} else if (keyEvent.keyCode == SWT.ARROW_DOWN || keyEvent.keyCode == SWT.ARROW_UP) {
+				// enable skipping through the list item by item
+				keyEvent.doit = true;
+				resetBuffer();
+			} else {
+				// only update buffer in case it is a visible character
+				keyEvent.doit = false;
+				if (!Character.isISOControl(keyEvent.character) || keyEvent.keyCode == SWT.BS) {
+					setClosestMatch(bufferAsString());
+				} else if (keyEvent.keyCode != SWT.SHIFT) {
+					resetBuffer();
+				}
+			}
+		}
+
+		@Override
+		public void keyPressed(KeyEvent keyEvent) {
+			keyEvent.doit = false;
+			if (keyPressTimedOut() && keyEvent.keyCode != SWT.CR) {
+				resetBuffer();
+			}
+
+			if (!Character.isISOControl(keyEvent.character)) {
+				addToBuffer(keyEvent.character);
+				resetKeyPressedTimeout();
+			} else if (keyEvent.keyCode == SWT.BS && !isEmptyBuffer()) {
+				removeLastFromBuffer();
+				resetKeyPressedTimeout();
+			} else if (keyEvent.keyCode == SWT.ARROW_DOWN || keyEvent.keyCode == SWT.ARROW_UP) {
+				// enable skipping through the list item by item
+				keyEvent.doit = true;
+			}
+		}
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java
index ba64fd0867..dc0315972b 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlSWTRenderer.java
@@ -14,6 +14,7 @@ package org.eclipse.emf.ecp.view.internal.core.swt.renderer;
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.emf.ecp.view.internal.core.swt.MessageKeys;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.core.swt.SimpleControlSWTControlSWTRenderer;
@@ -65,13 +66,14 @@ public class BooleanControlSWTRenderer extends SimpleControlSWTControlSWTRendere
 		// checkbox button representing Boolean value can not grow
 		final SWTGridCell booleanControlCell = super.createControlCell(column);
 		booleanControlCell.setHorizontalGrab(false);
+		booleanControlCell.setHorizontalFill(false);
 		return booleanControlCell;
 	}
 
 	@Override
 	protected Binding[] createBindings(Control control) throws DatabindingFailedException {
 		final Binding binding = getDataBindingContext().bindValue(WidgetProperties.selection().observe(control),
-			getModelValue());
+			getModelValue(), withPreSetValidation(new UpdateValueStrategy()), null);
 		return new Binding[] { binding };
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
index 303ee49626..50bd16f7fc 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
@@ -151,7 +151,8 @@ public class DateTimeControlSWTRenderer extends SimpleControlSWTControlSWTRender
 		final ISWTObservableValue dateObserver = WidgetProperties.selection().observe(dateWidget);
 		final ISWTObservableValue timeObserver = WidgetProperties.selection().observe(timeWidget);
 		final IObservableValue target = new DateAndTimeObservableValue(dateObserver, timeObserver);
-		final Binding binding = getDataBindingContext().bindValue(target, getModelValue(), null,
+		final Binding binding = getDataBindingContext().bindValue(target, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy()),
 			new DateModelToTargetUpdateStrategy());
 
 		domainModelChangeListener = new ModelChangeListener() {
@@ -223,7 +224,8 @@ public class DateTimeControlSWTRenderer extends SimpleControlSWTControlSWTRender
 		bUnset = new Button(dateTimeComposite, SWT.PUSH);
 		GridDataFactory.fillDefaults().grab(false, false).align(SWT.CENTER, SWT.CENTER).applyTo(bUnset);
 		bUnset
-			.setImage(imageRegistryService.getImage(FrameworkUtil.getBundle(getClass()), "icons/unset_feature.png")); //$NON-NLS-1$
+			.setImage(imageRegistryService.getImage(FrameworkUtil.getBundle(DateTimeControlSWTRenderer.class),
+				"icons/unset_feature.png")); //$NON-NLS-1$
 		bUnset.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_buttonUnset"); //$NON-NLS-1$
 		final String tooltip = getDateTimeDisplayType() == DateTimeDisplayType.TIME_ONLY
 			? MessageKeys.DateTimeControlSWTRenderer_CleanTime : MessageKeys.DateTimeControlSWTRenderer_CleanDate;
@@ -254,7 +256,8 @@ public class DateTimeControlSWTRenderer extends SimpleControlSWTControlSWTRender
 			: "icons/date.png"; //$NON-NLS-1$
 		setBtn = new Button(composite, SWT.PUSH);
 		GridDataFactory.fillDefaults().grab(false, false).align(SWT.CENTER, SWT.CENTER).applyTo(setBtn);
-		setBtn.setImage(imageRegistryService.getImage(FrameworkUtil.getBundle(getClass()), imagePath));
+		setBtn.setImage(
+			imageRegistryService.getImage(FrameworkUtil.getBundle(DateTimeControlSWTRenderer.class), imagePath));
 		setBtn.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_dateTime_buttonSet"); //$NON-NLS-1$
 		final String tooltip = getDateTimeDisplayType() == DateTimeDisplayType.TIME_ONLY
 			? MessageKeys.DateTimeControlSWTRenderer_SelectTime : MessageKeys.DateTimeControlSWTRenderer_SelectData;
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumLiteralFilteredComboViewerSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumLiteralFilteredComboViewerSWTRenderer.java
new file mode 100644
index 0000000000..aaef07985c
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumLiteralFilteredComboViewerSWTRenderer.java
@@ -0,0 +1,163 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.core.swt.renderer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.view.internal.core.swt.MatchItemComboViewer;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+
+/**
+ * Renderer for enums that makes use of a {@link MatchItemComboViewer}.
+ *
+ */
+public class EnumLiteralFilteredComboViewerSWTRenderer extends EnumComboViewerSWTRenderer {
+
+	private final EMFFormsEditSupport emfFormsEditSupport;
+
+	/**
+	 * Default constructor.
+	 *
+	 * @param vElement the view model element to be rendered
+	 * @param viewContext the view context
+	 * @param reportService The {@link ReportService}
+	 * @param emfFormsDatabinding The {@link EMFFormsDatabinding}
+	 * @param emfFormsLabelProvider The {@link EMFFormsLabelProvider}
+	 * @param vtViewTemplateProvider The {@link VTViewTemplateProvider}
+	 * @param emfFormsEditSupport The {@link EMFFormsEditSupport}
+	 */
+	@Inject
+	public EnumLiteralFilteredComboViewerSWTRenderer(VControl vElement, ViewModelContext viewContext,
+		ReportService reportService,
+		EMFFormsDatabinding emfFormsDatabinding, EMFFormsLabelProvider emfFormsLabelProvider,
+		VTViewTemplateProvider vtViewTemplateProvider, EMFFormsEditSupport emfFormsEditSupport) {
+		super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider,
+			emfFormsEditSupport);
+		this.emfFormsEditSupport = emfFormsEditSupport;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.view.internal.core.swt.renderer.EnumComboViewerSWTRenderer#createJFaceViewer(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected Viewer createJFaceViewer(final Composite parent) throws DatabindingFailedException {
+		final IValueProperty valueProperty = getEMFFormsDatabinding()
+			.getValueProperty(getVElement().getDomainModelReference(), getViewModelContext().getDomainModel());
+		final EStructuralFeature structuralFeature = (EStructuralFeature) valueProperty.getValueType();
+		final EList<EEnumLiteral> eLiterals = EEnum.class.cast(structuralFeature.getEType()).getELiterals();
+
+		final CCombo combo = new CCombo(parent, SWT.BORDER);
+		final MatchItemComboViewer viewer = new MatchItemComboViewer(combo) {
+			@Override
+			public void onEnter(int selectedIndex) {
+				if (!isEmptyBuffer() && selectedIndex > -1) {
+					final String closestMatch = getCCombo().getItems()[selectedIndex];
+					final Optional<EEnumLiteral> findLiteral = findLiteral(eLiterals, closestMatch);
+					if (findLiteral.isPresent()) {
+						setSelection(new StructuredSelection(findLiteral.get().getInstance()));
+					}
+				} else {
+					setClosestMatch(getCCombo().getText());
+				}
+				combo.clearSelection();
+			}
+		};
+		viewer.getCCombo().addFocusListener(new FocusListener() {
+
+			@Override
+			public void focusLost(FocusEvent e) {
+				combo.clearSelection();
+			}
+
+			@Override
+			public void focusGained(FocusEvent e) {
+
+			}
+		});
+		viewer.getCCombo().setEditable(true);
+		viewer.setContentProvider(new ArrayContentProvider());
+		viewer.setLabelProvider(new LabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				return emfFormsEditSupport
+					.getText(
+						getVElement().getDomainModelReference(),
+						getViewModelContext().getDomainModel(),
+						element);
+			}
+
+		});
+		final List<Object> inputValues = new ArrayList<Object>();
+		for (final EEnumLiteral literal : eLiterals) {
+			inputValues.add(literal.getInstance());
+		}
+		viewer.setInput(inputValues);
+		viewer.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_enum"); //$NON-NLS-1$
+		combo.addListener(SWT.Resize, new Listener() {
+			@Override
+			public void handleEvent(final Event argEvent) {
+				combo.setText(combo.getText());
+			}
+		});
+		return viewer;
+	}
+
+	/**
+	 * Search the given collection of {@link org.eclipse.emf.common.util.Enumerator Enumerator}s for the given literal.
+	 *
+	 * @param enumerators a collection of {@link org.eclipse.emf.common.util.Enumerator Enumerator}s to be searched
+	 * @param literal the literal to be searched for as a string
+	 * @return an {@link Optional} containing the matched literal
+	 */
+	private static Optional<EEnumLiteral> findLiteral(List<EEnumLiteral> enumerators,
+		String literal) {
+
+		for (final EEnumLiteral e : enumerators) {
+			if (e.getLiteral().equals(literal)) {
+				return Optional.of(e);
+			}
+		}
+
+		return Optional.empty();
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumLiteralFilteredComboViewerSWTRendererService.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumLiteralFilteredComboViewerSWTRendererService.java
new file mode 100644
index 0000000000..1152e4e7ec
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumLiteralFilteredComboViewerSWTRendererService.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.core.swt.renderer;
+
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedReport;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+
+/**
+ * {@link EnumLiteralFilteredComboViewerSWTRenderer} service.
+ *
+ */
+public class EnumLiteralFilteredComboViewerSWTRendererService implements EMFFormsDIRendererService<VControl> {
+
+	private EMFFormsDatabinding databindingService;
+	private ReportService reportService;
+
+	/**
+	 * Called by the initializer to set the EMFFormsDatabinding.
+	 *
+	 * @param databindingService the EMFFormsDatabinding
+	 */
+	protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
+		this.databindingService = databindingService;
+	}
+
+	/**
+	 * Called by the initializer to set the ReportService.
+	 *
+	 * @param reportService The ReportService
+	 */
+	protected void setReportService(ReportService reportService) {
+		this.reportService = reportService;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#isApplicable(VElement,ViewModelContext)
+	 */
+	@Override
+	public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+		if (!VControl.class.isInstance(vElement)) {
+			return NOT_APPLICABLE;
+		}
+		final VControl control = (VControl) vElement;
+		if (control.getDomainModelReference() == null) {
+			return NOT_APPLICABLE;
+		}
+		IValueProperty valueProperty;
+		try {
+			valueProperty = databindingService.getValueProperty(control.getDomainModelReference(),
+				viewModelContext.getDomainModel());
+		} catch (final DatabindingFailedException ex) {
+			reportService.report(new DatabindingFailedReport(ex));
+			return NOT_APPLICABLE;
+		}
+		final EStructuralFeature eStructuralFeature = EStructuralFeature.class.cast(valueProperty.getValueType());
+		if (eStructuralFeature.isMany()) {
+			return NOT_APPLICABLE;
+		}
+		if (!EAttribute.class.isInstance(eStructuralFeature)) {
+			return NOT_APPLICABLE;
+		}
+		final EAttribute eAttribute = EAttribute.class.cast(eStructuralFeature);
+
+		if (!EcorePackage.eINSTANCE.getEEnum().isInstance(eAttribute.getEType())) {
+			return NOT_APPLICABLE;
+		}
+
+		// higher than default EnumComboViewerSWTRenderer
+		return 4;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#getRendererClass()
+	 */
+	@Override
+	public Class<? extends AbstractSWTRenderer<VControl>> getRendererClass() {
+		return EnumLiteralFilteredComboViewerSWTRenderer.class;
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
index 777850cdc6..f7bd139c72 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
@@ -114,7 +114,7 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
 		final IObservableValue value = WidgetProperties.text().observe(hyperlink);
 		final Binding binding = getDataBindingContext().bindValue(value, getModelValue(),
-			createValueExtractingUpdateStrategy(),
+			withPreSetValidation(createValueExtractingUpdateStrategy()),
 			new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
@@ -125,7 +125,7 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
 		final IObservableValue tooltipValue = WidgetProperties.tooltipText().observe(hyperlink);
 		final Binding tooltipBinding = getDataBindingContext().bindValue(tooltipValue, getModelValue(),
-			createValueExtractingUpdateStrategy(),
+			withPreSetValidation(createValueExtractingUpdateStrategy()),
 			new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
@@ -135,7 +135,7 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
 		final IObservableValue imageValue = WidgetProperties.image().observe(imageHyperlink);
 		final Binding imageBinding = getDataBindingContext().bindValue(imageValue, getModelValue(),
-			new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER),
+			withPreSetValidation(new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)),
 			new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
@@ -145,7 +145,7 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
 		final IObservableValue deleteButtonEnablement = WidgetProperties.enabled().observe(deleteReferenceButton);
 		final Binding deleteBinding = getDataBindingContext().bindValue(deleteButtonEnablement, getModelValue(),
-			createValueExtractingUpdateStrategy(),
+			withPreSetValidation(createValueExtractingUpdateStrategy()),
 			new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
@@ -215,8 +215,12 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 		return composite;
 	}
 
-	private void createButtons(Composite parent) {
-
+	/**
+	 * Called by {@link #createSWTControl(Composite)} in order to create the buttons.
+	 *
+	 * @param parent the parent composite
+	 */
+	protected void createButtons(Composite parent) {
 		String elementDisplayName = null;
 		try {
 			elementDisplayName = (String) emfFormsLabelProvider.getDisplayName(getVElement().getDomainModelReference())
@@ -225,6 +229,18 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 			getReportService().report(new AbstractReport(ex));
 		}
 
+		createAddReferenceButton(parent, elementDisplayName);
+		createNewReferenceButton(parent, elementDisplayName);
+		createDeleteReferenceButton(parent, elementDisplayName);
+	}
+
+	/**
+	 * Called by {@link #createButtons(Composite)} to create the add existing reference button.
+	 *
+	 * @param parent the parent composite
+	 * @param elementDisplayName the display name of the reference
+	 */
+	protected void createAddReferenceButton(Composite parent, String elementDisplayName) {
 		addReferenceBtn = new Button(parent, SWT.PUSH);
 		GridDataFactory.fillDefaults().grab(false, false).align(SWT.CENTER, SWT.CENTER).applyTo(addReferenceBtn);
 		addReferenceBtn
@@ -245,7 +261,15 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 				}
 			}
 		});
+	}
 
+	/**
+	 * Called by {@link #createButtons(Composite)} to create the create new reference button.
+	 *
+	 * @param parent the parent composite
+	 * @param elementDisplayName the display name of the reference
+	 */
+	protected void createNewReferenceButton(Composite parent, String elementDisplayName) {
 		newReferenceBtn = new Button(parent, SWT.PUSH);
 		GridDataFactory.fillDefaults().grab(false, false).align(SWT.CENTER, SWT.CENTER).applyTo(newReferenceBtn);
 		newReferenceBtn
@@ -267,14 +291,21 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 				}
 			}
 		});
+	}
 
+	/**
+	 * Called by {@link #createButtons(Composite)} to create the delete reference button.
+	 *
+	 * @param parent the parent composite
+	 * @param elementDisplayName the display name of the reference
+	 */
+	protected void createDeleteReferenceButton(Composite parent, String elementDisplayName) {
 		deleteReferenceButton = new Button(parent, SWT.PUSH);
 		GridDataFactory.fillDefaults().grab(false, false).align(SWT.CENTER, SWT.CENTER).applyTo(deleteReferenceButton);
 		deleteReferenceButton
 			.setImage(imageRegistryService.getImage(getIconBundle(), "icons/unset_reference.png")); //$NON-NLS-1$
 		deleteReferenceButton.setToolTipText(getLocalizedString(MessageKeys.LinkControl_DeleteReference));
 		deleteReferenceButton.addSelectionListener(new DeleteSelectionAdapter());
-
 	}
 
 	private Bundle getIconBundle() {
@@ -365,7 +396,10 @@ public class LinkControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 		referenceService.openInNewContext(value);
 	}
 
-	private ReferenceService getReferenceService() {
+	/**
+	 * @return the {@link ReferenceService}
+	 */
+	protected ReferenceService getReferenceService() {
 		if (referenceService == null) {
 			referenceService = getViewModelContext().getService(ReferenceService.class);
 		}
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlSWTRenderer.java
index 9849ae7b0b..f174ef4f5f 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlSWTRenderer.java
@@ -19,9 +19,11 @@ import javax.inject.Inject;
 
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecp.edit.internal.swt.controls.NumericalHelper;
 import org.eclipse.emf.ecp.edit.spi.swt.util.ECPDialogExecutor;
@@ -128,12 +130,20 @@ public class NumberControlSWTRenderer extends TextControlSWTRenderer {
 	}
 
 	@Override
+	protected Object convert(Text text, EDataType attributeType, String value) throws DatabindingFailedException {
+		final EStructuralFeature eStructuralFeature = (EStructuralFeature) getModelValue().getValueType();
+		final NumericalTargetToModelUpdateStrategy converter = new NumericalTargetToModelUpdateStrategy(
+			eStructuralFeature, getModelValue(), getDataBindingContext(), text);
+		return converter.convert(value);
+	}
+
+	@Override
 	protected Binding[] createBindings(final Control control) throws DatabindingFailedException {
 		final EStructuralFeature structuralFeature = (EStructuralFeature) getModelValue().getValueType();
 
-		final NumericalTargetToModelUpdateStrategy targetToModelStrategy = new NumericalTargetToModelUpdateStrategy(
+		final UpdateValueStrategy targetToModelStrategy = withPreSetValidation(new NumericalTargetToModelUpdateStrategy(
 			structuralFeature, getModelValue(), getDataBindingContext(),
-			(Text) Composite.class.cast(control).getChildren()[0]);
+			(Text) Composite.class.cast(control).getChildren()[0]));
 		final NumericalModelToTargetUpdateStrategy modelToTargetStrategy = new NumericalModelToTargetUpdateStrategy(
 			getInstanceClass(structuralFeature), false);
 		final Binding binding = bindValue(control, getModelValue(), getDataBindingContext(),
@@ -164,6 +174,19 @@ public class NumberControlSWTRenderer extends TextControlSWTRenderer {
 		return feature.getEType().getInstanceClass();
 	}
 
+	@Override
+	protected String getTextFromTextField(Text text, EDataType attributeType) {
+		if (!Object.class.isAssignableFrom(attributeType.getInstanceClass())) {
+			/* primitive types */
+			return super.getTextFromTextField(text, attributeType);
+		}
+		if (text.getText() != null && text.getText().isEmpty()) {
+			/* string is empty, but since we are a non primitive type, return null instead */
+			return null;
+		}
+		return super.getTextFromTextField(text, attributeType);
+	}
+
 	/**
 	 * Converts the numerical value from the model to the target. Locale settings are respected,
 	 * i.e. formatting is performed according to the current locale.
@@ -172,11 +195,9 @@ public class NumberControlSWTRenderer extends TextControlSWTRenderer {
 
 		private final Class<?> instanceClass;
 
-		NumericalModelToTargetUpdateStrategy(Class<?> instanceClass,
-			boolean tooltip) {
+		NumericalModelToTargetUpdateStrategy(Class<?> instanceClass, boolean tooltip) {
 			super(tooltip);
 			this.instanceClass = instanceClass;
-
 		}
 
 		@Override
@@ -203,9 +224,8 @@ public class NumberControlSWTRenderer extends TextControlSWTRenderer {
 		private final EStructuralFeature eStructuralFeature;
 		private final DataBindingContext dataBindingContext;
 
-		NumericalTargetToModelUpdateStrategy(EStructuralFeature eStructuralFeature, IObservableValue modelValue,
-			DataBindingContext dataBindingContext,
-			Text text) {
+		NumericalTargetToModelUpdateStrategy(EStructuralFeature eStructuralFeature,
+			IObservableValue modelValue, DataBindingContext dataBindingContext, Text text) {
 			super(eStructuralFeature.isUnsettable());
 			this.eStructuralFeature = eStructuralFeature;
 			this.modelValue = modelValue;
@@ -214,8 +234,7 @@ public class NumberControlSWTRenderer extends TextControlSWTRenderer {
 		}
 
 		private DecimalFormat getFormat() {
-			return NumericalHelper.setupFormat(localeProvider.getLocale(),
-				getInstanceClass(eStructuralFeature));
+			return NumericalHelper.setupFormat(localeProvider.getLocale(), getInstanceClass(eStructuralFeature));
 		}
 
 		@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
index 617b3045e6..6418bef07c 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
@@ -23,9 +23,14 @@ import javax.inject.Inject;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecp.edit.internal.swt.util.DateUtil;
 import org.eclipse.emf.ecp.edit.spi.swt.util.ECPDialogExecutor;
@@ -195,6 +200,13 @@ public class XMLDateControlSWTRenderer extends TextControlSWTRenderer {
 		}
 	}
 
+	@Override
+	protected Object convert(Text text, EDataType attributeType, String value) throws DatabindingFailedException {
+		final EStructuralFeature eStructuralFeature = (EStructuralFeature) getModelValue().getValueType();
+		final DateTargetToModelUpdateStrategy converter = new DateTargetToModelUpdateStrategy(eStructuralFeature, text);
+		return converter.convert(value);
+	}
+
 	/**
 	 * Model to target strategy.
 	 */
@@ -245,11 +257,30 @@ public class XMLDateControlSWTRenderer extends TextControlSWTRenderer {
 
 		private final EStructuralFeature eStructuralFeature;
 		private final Text text;
+		private final boolean isDate;
 
 		DateTargetToModelUpdateStrategy(EStructuralFeature eStructuralFeature, Text text) {
 			super(eStructuralFeature.isUnsettable());
 			this.eStructuralFeature = eStructuralFeature;
 			this.text = text;
+			final EClassifier eType = eStructuralFeature.getEType();
+			if (eType == null) {
+				isDate = true;
+				return;
+			}
+			final EAnnotation eAnnotation = eType.getEAnnotation("http:///org/eclipse/emf/ecore/util/ExtendedMetaData");//$NON-NLS-1$
+			if (eAnnotation == null) {
+				isDate = true;
+				return;
+			}
+			final EMap<String, String> typeDetails = eAnnotation.getDetails();
+			if (typeDetails.containsKey("name")) {//$NON-NLS-1$
+				isDate = "date".equals(typeDetails.get("name"));//$NON-NLS-1$//$NON-NLS-2$
+			} else if (typeDetails.containsKey("baseType")) {//$NON-NLS-1$
+				isDate = typeDetails.get("baseType").endsWith("date");//$NON-NLS-1$//$NON-NLS-2$
+			} else {
+				isDate = true;
+			}
 
 		}
 
@@ -273,7 +304,10 @@ public class XMLDateControlSWTRenderer extends TextControlSWTRenderer {
 
 				final Calendar targetCal = Calendar.getInstance();
 				targetCal.setTime(date);
-				return DateUtil.convertOnlyDateToXMLGregorianCalendar(targetCal);
+				if (isDate) {
+					return DateUtil.convertOnlyDateToXMLGregorianCalendar(targetCal);
+				}
+				return DateUtil.convertCalendarToXMLGregorianCalendar(targetCal);
 			} catch (final ParseException ex) {
 				return revertToOldValue(value);
 			}
@@ -294,8 +328,10 @@ public class XMLDateControlSWTRenderer extends TextControlSWTRenderer {
 			}
 
 			final MessageDialog messageDialog = new MessageDialog(text.getShell(),
-				LocalizationServiceHelper.getString(getClass(), MessageKeys.XmlDateControlText_InvalidNumber), null,
-				LocalizationServiceHelper.getString(getClass(),
+				LocalizationServiceHelper.getString(XMLDateControlSWTRenderer.class,
+					MessageKeys.XmlDateControlText_InvalidNumber),
+				null,
+				LocalizationServiceHelper.getString(XMLDateControlSWTRenderer.class,
 					MessageKeys.XmlDateControlText_NumberInvalidValueWillBeUnset),
 				MessageDialog.ERROR,
 				new String[] { JFaceResources.getString(IDialogLabelKeys.OK_LABEL_KEY) }, 0);
@@ -330,7 +366,8 @@ public class XMLDateControlSWTRenderer extends TextControlSWTRenderer {
 		GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.CENTER).applyTo(control);
 		final Button bDate = new Button(main, SWT.PUSH);
 		GridDataFactory.fillDefaults().grab(false, false).align(SWT.CENTER, SWT.CENTER).applyTo(bDate);
-		bDate.setImage(imageRegistryService.getImage(FrameworkUtil.getBundle(getClass()), "icons/date.png")); //$NON-NLS-1$
+		bDate.setImage(
+			imageRegistryService.getImage(FrameworkUtil.getBundle(XMLDateControlSWTRenderer.class), "icons/date.png")); //$NON-NLS-1$
 		bDate.setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_control_xmldate"); //$NON-NLS-1$
 		text = (Text) Composite.class.cast(control).getChildren()[0];
 		bDate.addSelectionListener(new SelectionAdapterExtension(text, bDate));
@@ -354,8 +391,8 @@ public class XMLDateControlSWTRenderer extends TextControlSWTRenderer {
 
 		final IObservableValue value = WidgetProperties.text(SWT.FocusOut).observe(text);
 
-		final DateTargetToModelUpdateStrategy targetToModelUpdateStrategy = new DateTargetToModelUpdateStrategy(
-			structuralFeature, text);
+		final UpdateValueStrategy targetToModelUpdateStrategy = withPreSetValidation(
+			new DateTargetToModelUpdateStrategy(structuralFeature, text));
 
 		final DateModelToTargetUpdateStrategy modelToTargetUpdateStrategy = new DateModelToTargetUpdateStrategy(false);
 
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java
index d235637ad2..b70172bdeb 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java
@@ -13,6 +13,10 @@
 package org.eclipse.emf.ecp.view.spi.core.swt;
 
 import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.spi.swt.util.PreSetValidationStrategy;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.model.VControl;
 import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
@@ -104,6 +108,37 @@ public abstract class SimpleControlSWTControlSWTRenderer extends SimpleControlSW
 	}
 
 	/**
+	 * Create a {@link PreSetValidationStrategy}.
+	 *
+	 * @param delegate a delegate {@link UpdateValueStrategy}
+	 *
+	 * @return a {@link PreSetValidationStrategy}
+	 * @throws DatabindingFailedException in case the necessary feature can not be obtained
+	 *
+	 * @since 1.13
+	 */
+	protected UpdateValueStrategy withPreSetValidation(UpdateValueStrategy delegate)
+		throws DatabindingFailedException {
+		return new PreSetValidationStrategy(getVElement(), getFeature(), delegate);
+	}
+
+	/**
+	 * Retrieves the associated {@link EStructuralFeature} of this renderer.
+	 *
+	 * @return the feature
+	 * @throws DatabindingFailedException in case the necessary feature can not be obtained
+	 *
+	 * @since 1.13
+	 */
+	protected EStructuralFeature getFeature() throws DatabindingFailedException {
+		final EMFFormsDatabinding databindingService = getEMFFormsDatabinding();
+		final IValueProperty valueProperty = databindingService.getValueProperty(
+			getVElement().getDomainModelReference(),
+			getViewModelContext().getDomainModel());
+		return EStructuralFeature.class.cast(valueProperty.getValueType());
+	}
+
+	/**
 	 * Create the {@link Binding Bindings} for this controls.
 	 *
 	 * @param control the {@link Control} to create the binding for
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
index 0703f8035a..76c3adc4ff 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
@@ -21,9 +21,14 @@ import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.IObserving;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.edit.internal.swt.util.PreSetValidationListeners;
 import org.eclipse.emf.ecp.view.internal.core.swt.MessageKeys;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.core.swt.SimpleControlSWTControlSWTRenderer;
@@ -41,6 +46,8 @@ import org.eclipse.emf.ecp.view.template.style.alignment.model.VTAlignmentStyleP
 import org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.VTTextControlEnablementStyleProperty;
 import org.eclipse.emf.edit.command.SetCommand;
 import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.common.validation.PreSetValidationService;
+import org.eclipse.emfforms.spi.common.validation.PreSetValidationServiceRunnable;
 import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
 import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedReport;
 import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
@@ -54,8 +61,6 @@ import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -96,8 +101,8 @@ public class TextControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 	@Override
 	protected Binding[] createBindings(Control control) throws DatabindingFailedException {
 		final EStructuralFeature structuralFeature = (EStructuralFeature) getModelValue().getValueType();
-		final TargetToModelUpdateStrategy targetToModelUpdateStrategy = new TargetToModelUpdateStrategy(
-			structuralFeature.isUnsettable());
+		final UpdateValueStrategy targetToModelUpdateStrategy = withPreSetValidation(
+			new TargetToModelUpdateStrategy(structuralFeature.isUnsettable()));
 		final ModelToTargetUpdateStrategy modelToTargetUpdateStrategy = new ModelToTargetUpdateStrategy(false);
 		final Binding binding = bindValue(control, getModelValue(), getDataBindingContext(),
 			targetToModelUpdateStrategy,
@@ -115,16 +120,48 @@ public class TextControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 		final Text text = new Text(composite, getTextWidgetStyle());
 		text.setData(CUSTOM_VARIANT, getTextVariantID());
 		text.setMessage(getTextMessage());
-		text.addFocusListener(new FocusListener() {
-			@Override
-			public void focusLost(FocusEvent e) {
-			}
 
-			@Override
-			public void focusGained(FocusEvent e) {
-				text.selectAll();
-			}
-		});
+		try {
+			PreSetValidationListeners.create().verify(text, getFeature(), getVElement());
+			PreSetValidationListeners.create().focus(text, getFeature(),
+				new PreSetValidationServiceRunnable() {
+					@Override
+					public void run(PreSetValidationService service) {
+						try {
+							final EDataType attributeType = ((EAttribute) getFeature()).getEAttributeType();
+							final String textFieldText = getTextFromTextField(text, attributeType);
+							final Object convertedValue = convert(text, attributeType, textFieldText);
+							final Diagnostic textDiag = service.validate(getFeature(), convertedValue);
+							final Diagnostic boundDiag = service.validate(getFeature(), getModelValue().getValue());
+							final boolean isEnteredValueValid = textDiag.getSeverity() == Diagnostic.OK;
+							final boolean isBoundValueValid = boundDiag.getSeverity() == Diagnostic.OK;
+
+							if (getModelValue().getValue() != null && !isEnteredValueValid && isBoundValueValid) {
+								// revert
+								getVElement().setDiagnostic(null);
+								getDataBindingContext().updateTargets();
+							}
+						} catch (final DatabindingFailedException e) {
+							// can we can do something reasonable here?
+						} catch (final IllegalArgumentException ex) {
+							// TODO: can the previously stored value be invalid?
+							// restore previous value and clear diagnostics
+							getVElement().setDiagnostic(null);
+							getDataBindingContext().updateTargets();
+							return;
+						}
+					}
+				},
+				new Runnable() {
+					@Override
+					public void run() {
+						text.selectAll();
+					}
+				});
+		} catch (final DatabindingFailedException ex) {
+			// ignore
+		}
+
 		final GridDataFactory gdf = GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
 			.grab(true, true).span(1, 1);
 		final EMFFormsEditSupport editSupport = getEMFFormsEditSupport();
@@ -136,6 +173,20 @@ public class TextControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 	}
 
 	/**
+	 * Convert the given value from target to model.
+	 *
+	 * @param text the Text control
+	 * @param attributeType the model data type
+	 * @param value the target value to convert
+	 * @return the converted value
+	 * @throws DatabindingFailedException in case the databinding failed
+	 * @since 1.13
+	 */
+	protected Object convert(Text text, EDataType attributeType, String value) throws DatabindingFailedException {
+		return EcoreUtil.createFromString(attributeType, value);
+	}
+
+	/**
 	 * Returns the text which should be set as the message text on the Text field.
 	 *
 	 * @return the string to show as the message
@@ -329,6 +380,18 @@ public class TextControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 	}
 
 	/**
+	 * Gets the text displayed in the textfield.
+	 *
+	 * @param text the {@link Text}
+	 * @param attributeType the {@link EDataType}
+	 * @return the string displayed in the {@link Text}
+	 * @since 1.13
+	 */
+	protected String getTextFromTextField(final Text text, EDataType attributeType) {
+		return text.getText();
+	}
+
+	/**
 	 * An {@link EMFUpdateConvertValueStrategy} that encapsulates the converting
 	 * of the actual value. Use this class to provide a specific context
 	 * for the conversion of the value, but likewise enable it clients to modify
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
index 21a482e9e8..b17ae8c67c 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.custom.model.provider.CustomEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.custom.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml
index 11f8c42319..118d206be5 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
index 93e4c1f02b..1765e18ebb 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.custom.model.impl.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.custom.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/EMFFormsCustomDMRExpander.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRConverter.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRMappingProvider.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.StructuralChangeCustomDMRTester.xml
 Import-Package: org.eclipse.core.databinding.property.list;version="0.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
  org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emf.ecp.common.spi;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.spi.asserts;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.spi;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.spi.asserts;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml
index 68563a4ad3..7b06e569c1 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/StructuralChangeCustomDMRTester.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/StructuralChangeCustomDMRTester.java
index 855913fd7f..8bf3932580 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/StructuralChangeCustomDMRTester.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/StructuralChangeCustomDMRTester.java
@@ -109,7 +109,7 @@ public class StructuralChangeCustomDMRTester implements StructuralChangeTesterIn
 		}
 		boolean result = true;
 		for (final VDomainModelReference dmr : customDMR.getDomainModelReferences()) {
-			result &= getEMFFormsStructuralChangeTester().isStructureChanged(dmr, domainRootObject, notification);
+			result |= getEMFFormsStructuralChangeTester().isStructureChanged(dmr, domainRootObject, notification);
 		}
 		return result;
 	}
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
index 00dbf901fd..e0decc6104 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom View SWT DI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt.di;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.swt.widgets;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml
index 709b7c9f54..56966c3d9d 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
index 221a84df5d..ace73c8734 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom View SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.custom.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.custom.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
- org.eclipse.emf.ecp.view.spi.custom.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.custom.swt;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
+ org.eclipse.emf.ecp.view.spi.custom.swt;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml
index 64d46f2cd6..11f217753a 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
index 12bfd8382e..b8942c36d9 100644
--- a/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Edapt
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.edapt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edapt.history;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml
index 2417ba108d..8a3dffce6f 100644
--- a/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.edapt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
index ffaf84482e..9622fbc10d 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.group.model.provider.GroupEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.group.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml
index 7b573b31c4..bf2b69197e 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupEditPlugin.java b/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupEditPlugin.java
index 87094b24a5..57d709e0ba 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupEditPlugin.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupEditPlugin.java
@@ -13,23 +13,21 @@ package org.eclipse.emf.ecp.view.spi.group.model.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 import org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin;
 
 /**
  * This is the central singleton for the Group edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public final class GroupEditPlugin extends EMFPlugin
-{
+public final class GroupEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final GroupEditPlugin INSTANCE = new GroupEditPlugin();
@@ -38,7 +36,7 @@ public final class GroupEditPlugin extends EMFPlugin
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -47,14 +45,11 @@ public final class GroupEditPlugin extends EMFPlugin
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public GroupEditPlugin()
-	{
-		super(new ResourceLocator[]
-		{
-			EcoreEditPlugin.INSTANCE,
+	public GroupEditPlugin() {
+		super(new ResourceLocator[] {
 			ViewEditPlugin.INSTANCE,
 		});
 	}
@@ -63,13 +58,12 @@ public final class GroupEditPlugin extends EMFPlugin
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getPluginResourceLocator()
-	{
+	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}
 
@@ -77,12 +71,11 @@ public final class GroupEditPlugin extends EMFPlugin
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
-	public static Implementation getPlugin()
-	{
+	public static Implementation getPlugin() {
 		return plugin;
 	}
 
@@ -90,20 +83,18 @@ public final class GroupEditPlugin extends EMFPlugin
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static class Implementation extends EclipsePlugin
-	{
+	public static class Implementation extends EclipsePlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
-		public Implementation()
-		{
+		public Implementation() {
 			super();
 
 			// Remember the static instance.
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProvider.java b/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProvider.java
index 6c7b62a150..d09a06002e 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProvider.java
@@ -36,8 +36,7 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * @generated
  */
 public class GroupItemProvider
-	extends ContainedContainerItemProvider
-{
+	extends ContainedContainerItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -45,8 +44,7 @@ public class GroupItemProvider
 	 *
 	 * @generated
 	 */
-	public GroupItemProvider(AdapterFactory adapterFactory)
-	{
+	public GroupItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -58,12 +56,11 @@ public class GroupItemProvider
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addTooltipPropertyDescriptor(object);
 			addGroupTypePropertyDescriptor(object);
 			addLabelAlignmentPropertyDescriptor(object);
 			addCollapsedPropertyDescriptor(object);
@@ -72,19 +69,41 @@ public class GroupItemProvider
 	}
 
 	/**
+	 * This adds a property descriptor for the Tooltip feature.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addTooltipPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_HasTooltip_tooltip_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_HasTooltip_tooltip_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_HasTooltip_type"), //$NON-NLS-1$
+				VViewPackage.Literals.HAS_TOOLTIP__TOOLTIP,
+				true,
+				true,
+				false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Group Type feature.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
-	protected void addGroupTypePropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addGroupTypePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Group_groupType_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Group_groupType_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -103,14 +122,11 @@ public class GroupItemProvider
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
-	protected void addLabelAlignmentPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addLabelAlignmentPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Group_labelAlignment_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Group_labelAlignment_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -129,14 +145,11 @@ public class GroupItemProvider
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
-	protected void addCollapsedPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addCollapsedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Group_collapsed_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Group_collapsed_feature", "_UI_Group_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -157,8 +170,7 @@ public class GroupItemProvider
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/Group")); //$NON-NLS-1$
 	}
 
@@ -170,14 +182,12 @@ public class GroupItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		String label = ((VGroup) object).getLabel();
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_Group_type") : //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_Group_type") : //$NON-NLS-1$
 			getString("_UI_Group_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -190,12 +200,11 @@ public class GroupItemProvider
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VGroup.class))
-		{
+		switch (notification.getFeatureID(VGroup.class)) {
+		case VGroupPackage.GROUP__TOOLTIP:
 		case VGroupPackage.GROUP__GROUP_TYPE:
 		case VGroupPackage.GROUP__LABEL_ALIGNMENT:
 		case VGroupPackage.GROUP__COLLAPSED:
@@ -214,14 +223,11 @@ public class GroupItemProvider
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VViewPackage.Literals.CONTAINER__CHILDREN,
-				VGroupFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(VViewPackage.Literals.CONTAINER__CHILDREN,
+			VGroupFactory.eINSTANCE.createGroup()));
 	}
 
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProviderAdapterFactory.java
index 925d80928d..c1eabf67b5 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/src/org/eclipse/emf/ecp/view/spi/group/model/provider/GroupItemProviderAdapterFactory.java
@@ -51,17 +51,16 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class GroupItemProviderAdapterFactory extends GroupAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable, IChildCreationExtender
-{
+	IChangeNotifier, IDisposable, IChildCreationExtender {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -70,7 +69,7 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -79,7 +78,7 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This helps manage the child creation extenders.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
@@ -89,7 +88,7 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -98,11 +97,10 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public GroupItemProviderAdapterFactory()
-	{
+	public GroupItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -115,7 +113,7 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected GroupItemProvider groupItemProvider;
@@ -124,14 +122,12 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.group.model.VGroup}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createGroupAdapter()
-	{
-		if (groupItemProvider == null)
-		{
+	public Adapter createGroupAdapter() {
+		if (groupItemProvider == null) {
 			groupItemProvider = new GroupItemProvider(this);
 		}
 
@@ -142,12 +138,11 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ComposeableAdapterFactory getRootAdapterFactory()
-	{
+	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
 
@@ -155,24 +150,22 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
-	{
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean isFactoryForType(Object type)
-	{
+	public boolean isFactoryForType(Object type) {
 		return supportedTypes.contains(type) || super.isFactoryForType(type);
 	}
 
@@ -180,29 +173,25 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter adapt(Notifier notifier, Object type)
-	{
+	public Adapter adapt(Notifier notifier, Object type) {
 		return super.adapt(notifier, this);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object adapt(Object object, Object type)
-	{
-		if (isFactoryForType(type))
-		{
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
-			{
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -213,35 +202,32 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public List<IChildCreationExtender> getChildCreationExtenders()
-	{
+	public List<IChildCreationExtender> getChildCreationExtenders() {
 		return childCreationExtenderManager.getChildCreationExtenders();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain)
-	{
+	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
 		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return childCreationExtenderManager;
 	}
 
@@ -249,12 +235,11 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void addListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
 
@@ -262,12 +247,11 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void removeListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
 
@@ -275,16 +259,14 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void fireNotifyChanged(Notification notification)
-	{
+	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null)
-		{
+		if (parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -293,40 +275,36 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void dispose()
-	{
-		if (groupItemProvider != null) {
+	public void dispose() {
+		if (groupItemProvider != null)
 			groupItemProvider.dispose();
-		}
 	}
 
 	/**
 	 * A child creation extender for the {@link VViewPackage}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static class ViewChildCreationExtender implements IChildCreationExtender
-	{
+	public static class ViewChildCreationExtender implements IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
-		protected static class CreationSwitch extends ViewSwitch<Object>
-		{
+		protected static class CreationSwitch extends ViewSwitch<Object> {
 			/**
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			protected List<Object> newChildDescriptors;
@@ -335,7 +313,7 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 			 * The domain in which to create the children.
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			protected EditingDomain editingDomain;
@@ -344,11 +322,10 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 			 * Creates the a switch for populating child descriptors in the given domain.
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain)
-			{
+			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
 				this.newChildDescriptors = newChildDescriptors;
 				this.editingDomain = editingDomain;
 			}
@@ -356,16 +333,13 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 			/**
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			@Override
-			public Object caseView(VView object)
-			{
-				newChildDescriptors.add
-					(createChildParameter
-					(VViewPackage.Literals.VIEW__CHILDREN,
-						VGroupFactory.eINSTANCE.createGroup()));
+			public Object caseView(VView object) {
+				newChildDescriptors.add(createChildParameter(VViewPackage.Literals.VIEW__CHILDREN,
+					VGroupFactory.eINSTANCE.createGroup()));
 
 				return null;
 			}
@@ -373,16 +347,13 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 			/**
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			@Override
-			public Object caseContainer(VContainer object)
-			{
-				newChildDescriptors.add
-					(createChildParameter
-					(VViewPackage.Literals.CONTAINER__CHILDREN,
-						VGroupFactory.eINSTANCE.createGroup()));
+			public Object caseContainer(VContainer object) {
+				newChildDescriptors.add(createChildParameter(VViewPackage.Literals.CONTAINER__CHILDREN,
+					VGroupFactory.eINSTANCE.createGroup()));
 
 				return null;
 			}
@@ -390,11 +361,10 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 			/**
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
-			protected CommandParameter createChildParameter(Object feature, Object child)
-			{
+			protected CommandParameter createChildParameter(Object feature, Object child) {
 				return new CommandParameter(null, feature, child);
 			}
 
@@ -403,13 +373,12 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain)
-		{
-			final ArrayList<Object> result = new ArrayList<Object>();
+		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+			ArrayList<Object> result = new ArrayList<Object>();
 			new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
 			return result;
 		}
@@ -417,12 +386,11 @@ public class GroupItemProviderAdapterFactory extends GroupAdapterFactory impleme
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
-		public ResourceLocator getResourceLocator()
-		{
+		public ResourceLocator getResourceLocator() {
 			return GroupEditPlugin.INSTANCE;
 		}
 	}
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.group.model/.settings/.api_filters
index af68d84c56..38267c7c11 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/.settings/.api_filters
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.emf.ecp.view.group.model" version="2">
     <resource path="META-INF/MANIFEST.MF">
+        <filter comment="SPI Changes for 1.13" id="923795461">
+            <message_arguments>
+                <message_argument value="1.13.0"/>
+                <message_argument value="1.12.0"/>
+            </message_arguments>
+        </filter>
         <filter comment="This is SPI" id="923795461">
             <message_arguments>
                 <message_argument value="1.3.0"/>
@@ -121,6 +127,13 @@
                 <message_argument value="11"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage"/>
+                <message_argument value="GROUP_FEATURE_COUNT"/>
+                <message_argument value="12"/>
+            </message_arguments>
+        </filter>
         <filter comment="This is SPI" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage"/>
@@ -170,6 +183,13 @@
                 <message_argument value="10"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage"/>
+                <message_argument value="GROUP__COLLAPSED"/>
+                <message_argument value="11"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage"/>
@@ -205,6 +225,20 @@
                 <message_argument value="8"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage"/>
+                <message_argument value="GROUP__GROUP_TYPE"/>
+                <message_argument value="9"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage"/>
+                <message_argument value="GROUP__LABEL_ALIGNMENT"/>
+                <message_argument value="10"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
index 7b52cc8410..4259c7c4c3 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.group.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.group.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
index fe78f5b9bb..0fb670f3e4 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="group" nsURI="http://org/eclipse/emf/ecp/view/group/model" nsPrefix="org.eclipse.emf.ecp.view.group.model">
-  <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedContainer">
+  <eClassifiers xsi:type="ecore:EClass" name="Group" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedContainer ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//HasTooltip">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="groupType" lowerBound="1"
         eType="#//GroupType"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="labelAlignment" eType="#//GroupLabelAlignment"
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.genmodel b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.genmodel
index 603a2d68c0..2fa03ce07a 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.genmodel
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.genmodel
@@ -1,25 +1,31 @@
-<?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-2013 EclipseSource Muenchen GmbH and others.&#xD;&#xA;&#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;Eugen Neufeld - initial API and implementation"

-    modelDirectory="/org.eclipse.emf.ecp.view.group.model/src" modelPluginID="org.eclipse.emf.ecp.view.group.model"

-    modelName="Group" editPluginClass="org.eclipse.emf.ecp.view.spi.group.model.provider.GroupEditPlugin"

-    nonNLSMarkers="true" codeFormatting="true" commentFormatting="true" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="6.0" copyrightFields="false" providerRootExtendsClass="" language=""

-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"

-    interfaceNamePattern="V{0}" classNamePattern="V{0}Impl" importOrganizing="true">

-  <foreignModel>group.ecore</foreignModel>

-  <genPackages prefix="Group" basePackage="org.eclipse.emf.ecp.view.spi" disposableProviderFactory="true"

-      interfacePackageSuffix="model" metaDataPackageSuffix="model" classPackageSuffix="model.impl"

-      utilityPackageSuffix="model.util" providerPackageSuffix="model.provider" presentationPackageSuffix="model.presentation"

-      testsPackageSuffix="model.tests" extensibleProviderFactory="true" childCreationExtenders="true"

-      ecorePackage="group.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="group.ecore#//GroupLabelAlignment">

-      <genEnumLiterals ecoreEnumLiteral="group.ecore#//GroupLabelAlignment/LabelAligned"/>

-      <genEnumLiterals ecoreEnumLiteral="group.ecore#//GroupLabelAlignment/InputAligned"/>

-    </genEnums>

-    <genClasses ecoreClass="group.ecore#//Group">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute group.ecore#//Group/containerLayoutEmbedding"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute group.ecore#//Group/labelAlignment"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?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-2013 EclipseSource Muenchen GmbH and others.&#xD;&#xA;&#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;Eugen Neufeld - initial API and implementation"
+    modelDirectory="/org.eclipse.emf.ecp.view.group.model/src" modelPluginID="org.eclipse.emf.ecp.view.group.model"
+    modelName="Group" editPluginClass="org.eclipse.emf.ecp.view.spi.group.model.provider.GroupEditPlugin"
+    nonNLSMarkers="true" codeFormatting="true" commentFormatting="true" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="6.0" copyrightFields="false" providerRootExtendsClass="" language=""
+    usedGenPackages="../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
+    interfaceNamePattern="V{0}" classNamePattern="V{0}Impl" importOrganizing="true">
+  <foreignModel>group.ecore</foreignModel>
+  <genPackages prefix="Group" basePackage="org.eclipse.emf.ecp.view.spi" disposableProviderFactory="true"
+      interfacePackageSuffix="model" metaDataPackageSuffix="model" classPackageSuffix="model.impl"
+      utilityPackageSuffix="model.util" providerPackageSuffix="model.provider" presentationPackageSuffix="model.presentation"
+      testsPackageSuffix="model.tests" extensibleProviderFactory="true" childCreationExtenders="true"
+      ecorePackage="group.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="group.ecore#//GroupType">
+      <genEnumLiterals ecoreEnumLiteral="group.ecore#//GroupType/Normal"/>
+      <genEnumLiterals ecoreEnumLiteral="group.ecore#//GroupType/Embedded"/>
+      <genEnumLiterals ecoreEnumLiteral="group.ecore#//GroupType/Collapsible"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="group.ecore#//GroupLabelAlignment">
+      <genEnumLiterals ecoreEnumLiteral="group.ecore#//GroupLabelAlignment/LabelAligned"/>
+      <genEnumLiterals ecoreEnumLiteral="group.ecore#//GroupLabelAlignment/InputAligned"/>
+    </genEnums>
+    <genClasses ecoreClass="group.ecore#//Group">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute group.ecore#//Group/groupType"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute group.ecore#//Group/labelAlignment"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute group.ecore#//Group/collapsed"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml
index 338800c85f..21325d5ebf 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupLabelAlignment.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupLabelAlignment.java
index 006f194915..8ee54fbe56 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupLabelAlignment.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupLabelAlignment.java
@@ -24,18 +24,16 @@ import org.eclipse.emf.common.util.Enumerator;
  *
  * @since 1.3
  *        <!-- end-user-doc -->
- *
  * @see org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage#getGroupLabelAlignment()
  * @model
  * @generated
  */
-public enum GroupLabelAlignment implements Enumerator
-{
+public enum GroupLabelAlignment implements Enumerator {
 	/**
 	 * The '<em><b>Label Aligned</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #LABEL_ALIGNED_VALUE
 	 * @generated
 	 * @ordered
@@ -46,7 +44,7 @@ public enum GroupLabelAlignment implements Enumerator
 	 * The '<em><b>Input Aligned</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #INPUT_ALIGNED_VALUE
 	 * @generated
 	 * @ordered
@@ -61,7 +59,7 @@ public enum GroupLabelAlignment implements Enumerator
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #LABEL_ALIGNED
 	 * @model name="LabelAligned"
 	 * @generated
@@ -77,7 +75,7 @@ public enum GroupLabelAlignment implements Enumerator
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #INPUT_ALIGNED
 	 * @model name="InputAligned"
 	 * @generated
@@ -89,21 +87,19 @@ public enum GroupLabelAlignment implements Enumerator
 	 * An array of all the '<em><b>Label Alignment</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	private static final GroupLabelAlignment[] VALUES_ARRAY =
-		new GroupLabelAlignment[]
-		{
-			LABEL_ALIGNED,
-			INPUT_ALIGNED,
-		};
+	private static final GroupLabelAlignment[] VALUES_ARRAY = new GroupLabelAlignment[] {
+		LABEL_ALIGNED,
+		INPUT_ALIGNED,
+	};
 
 	/**
 	 * A public read-only list of all the '<em><b>Label Alignment</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<GroupLabelAlignment> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -112,16 +108,15 @@ public enum GroupLabelAlignment implements Enumerator
 	 * Returns the '<em><b>Label Alignment</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-	public static GroupLabelAlignment get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			final GroupLabelAlignment result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
+	public static GroupLabelAlignment get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			GroupLabelAlignment result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -132,16 +127,15 @@ public enum GroupLabelAlignment implements Enumerator
 	 * Returns the '<em><b>Label Alignment</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-	public static GroupLabelAlignment getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			final GroupLabelAlignment result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
+	public static GroupLabelAlignment getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			GroupLabelAlignment result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -152,13 +146,13 @@ public enum GroupLabelAlignment implements Enumerator
 	 * Returns the '<em><b>Label Alignment</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-	public static GroupLabelAlignment get(int value)
-	{
-		switch (value)
-		{
+	public static GroupLabelAlignment get(int value) {
+		switch (value) {
 		case LABEL_ALIGNED_VALUE:
 			return LABEL_ALIGNED;
 		case INPUT_ALIGNED_VALUE:
@@ -170,7 +164,7 @@ public enum GroupLabelAlignment implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -178,7 +172,7 @@ public enum GroupLabelAlignment implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -186,7 +180,7 @@ public enum GroupLabelAlignment implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -195,11 +189,10 @@ public enum GroupLabelAlignment implements Enumerator
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	private GroupLabelAlignment(int value, String name, String literal)
-	{
+	private GroupLabelAlignment(int value, String name, String literal) {
 		this.value = value;
 		this.name = name;
 		this.literal = literal;
@@ -208,36 +201,33 @@ public enum GroupLabelAlignment implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public int getValue()
-	{
+	public int getValue() {
 		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getName()
-	{
+	public String getName() {
 		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getLiteral()
-	{
+	public String getLiteral() {
 		return literal;
 	}
 
@@ -245,12 +235,11 @@ public enum GroupLabelAlignment implements Enumerator
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		return literal;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupType.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupType.java
index 502e6921ce..2a96f77493 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupType.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/GroupType.java
@@ -24,18 +24,16 @@ import org.eclipse.emf.common.util.Enumerator;
  *
  * @since 1.4
  *        <!-- end-user-doc -->
- *
  * @see org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage#getGroupType()
  * @model
  * @generated
  */
-public enum GroupType implements Enumerator
-{
+public enum GroupType implements Enumerator {
 	/**
 	 * The '<em><b>Normal</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #NORMAL_VALUE
 	 * @generated
 	 * @ordered
@@ -46,7 +44,7 @@ public enum GroupType implements Enumerator
 	 * The '<em><b>Embedded</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #EMBEDDED_VALUE
 	 * @generated
 	 * @ordered
@@ -57,7 +55,7 @@ public enum GroupType implements Enumerator
 	 * The '<em><b>Collapsible</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #COLLAPSIBLE_VALUE
 	 * @generated
 	 * @ordered
@@ -72,7 +70,7 @@ public enum GroupType implements Enumerator
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #NORMAL
 	 * @model name="Normal"
 	 * @generated
@@ -88,7 +86,7 @@ public enum GroupType implements Enumerator
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #EMBEDDED
 	 * @model name="Embedded"
 	 * @generated
@@ -104,7 +102,7 @@ public enum GroupType implements Enumerator
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #COLLAPSIBLE
 	 * @model name="Collapsible"
 	 * @generated
@@ -116,22 +114,20 @@ public enum GroupType implements Enumerator
 	 * An array of all the '<em><b>Type</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	private static final GroupType[] VALUES_ARRAY =
-		new GroupType[]
-		{
-			NORMAL,
-			EMBEDDED,
-			COLLAPSIBLE,
-		};
+	private static final GroupType[] VALUES_ARRAY = new GroupType[] {
+		NORMAL,
+		EMBEDDED,
+		COLLAPSIBLE,
+	};
 
 	/**
 	 * A public read-only list of all the '<em><b>Type</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<GroupType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -140,16 +136,15 @@ public enum GroupType implements Enumerator
 	 * Returns the '<em><b>Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-	public static GroupType get(String literal)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			final GroupType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal))
-			{
+	public static GroupType get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			GroupType result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -160,16 +155,15 @@ public enum GroupType implements Enumerator
 	 * Returns the '<em><b>Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-	public static GroupType getByName(String name)
-	{
-		for (int i = 0; i < VALUES_ARRAY.length; ++i)
-		{
-			final GroupType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name))
-			{
+	public static GroupType getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			GroupType result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -180,13 +174,13 @@ public enum GroupType implements Enumerator
 	 * Returns the '<em><b>Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
-	public static GroupType get(int value)
-	{
-		switch (value)
-		{
+	public static GroupType get(int value) {
+		switch (value) {
 		case NORMAL_VALUE:
 			return NORMAL;
 		case EMBEDDED_VALUE:
@@ -200,7 +194,7 @@ public enum GroupType implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -208,7 +202,7 @@ public enum GroupType implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -216,7 +210,7 @@ public enum GroupType implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -225,11 +219,10 @@ public enum GroupType implements Enumerator
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	private GroupType(int value, String name, String literal)
-	{
+	private GroupType(int value, String name, String literal) {
 		this.value = value;
 		this.name = name;
 		this.literal = literal;
@@ -238,36 +231,33 @@ public enum GroupType implements Enumerator
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public int getValue()
-	{
+	public int getValue() {
 		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getName()
-	{
+	public String getName() {
 		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getLiteral()
-	{
+	public String getLiteral() {
 		return literal;
 	}
 
@@ -275,12 +265,11 @@ public enum GroupType implements Enumerator
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		return literal;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroup.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroup.java
index c222135fc2..34aa8ae48e 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroup.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroup.java
@@ -12,6 +12,7 @@
 package org.eclipse.emf.ecp.view.spi.group.model;
 
 import org.eclipse.emf.ecp.view.spi.model.VContainedContainer;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 
 /**
  * <!-- begin-user-doc -->
@@ -20,19 +21,18 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedContainer;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.group.model.VGroup#getGroupType <em>Group Type</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.group.model.VGroup#getLabelAlignment <em>Label Alignment</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.group.model.VGroup#isCollapsed <em>Collapsed</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage#getGroup()
  * @model
  * @generated
  */
-public interface VGroup extends VContainedContainer
-{
+public interface VGroup extends VContainedContainer, VHasTooltip {
 
 	/**
 	 * Returns the value of the '<em><b>Group Type</b></em>' attribute.
@@ -45,7 +45,6 @@ public interface VGroup extends VContainedContainer
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Group Type</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupType
 	 * @see #setGroupType(GroupType)
@@ -62,7 +61,6 @@ public interface VGroup extends VContainedContainer
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @param value the new value of the '<em>Group Type</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupType
 	 * @see #getGroupType()
@@ -80,7 +78,7 @@ public interface VGroup extends VContainedContainer
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Label Alignment</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment
 	 * @see #setLabelAlignment(GroupLabelAlignment)
@@ -91,13 +89,12 @@ public interface VGroup extends VContainedContainer
 	GroupLabelAlignment getLabelAlignment();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.group.model.VGroup#getLabelAlignment
-	 * <em>Label Alignment</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.group.model.VGroup#getLabelAlignment <em>Label
+	 * Alignment</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @param value the new value of the '<em>Label Alignment</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment
 	 * @see #getLabelAlignment()
@@ -115,7 +112,6 @@ public interface VGroup extends VContainedContainer
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Collapsed</em>' attribute.
 	 * @see #setCollapsed(boolean)
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage#getGroup_Collapsed()
@@ -131,7 +127,6 @@ public interface VGroup extends VContainedContainer
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @param value the new value of the '<em>Collapsed</em>' attribute.
 	 * @see #isCollapsed()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupFactory.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupFactory.java
index 091fc13524..5b63d6bece 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupFactory.java
@@ -18,17 +18,16 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage
  * @generated
  */
-public interface VGroupFactory extends EFactory
-{
+public interface VGroupFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	VGroupFactory eINSTANCE = org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupFactoryImpl.init();
@@ -37,7 +36,7 @@ public interface VGroupFactory extends EFactory
 	 * Returns a new object of class '<em>Group</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Group</em>'.
 	 * @generated
 	 */
@@ -47,7 +46,7 @@ public interface VGroupFactory extends EFactory
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupPackage.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupPackage.java
index 5e28d710f7..b880e156b7 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/VGroupPackage.java
@@ -30,13 +30,11 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  *
  * @noimplement This interface is not intended to be implemented by clients.
  *              <!-- end-user-doc -->
- *
  * @see org.eclipse.emf.ecp.view.spi.group.model.VGroupFactory
  * @model kind="package"
  * @generated
  */
-public interface VGroupPackage extends EPackage
-{
+public interface VGroupPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
@@ -96,6 +94,18 @@ public interface VGroupPackage extends EPackage
 	int GROUP__NAME = VViewPackage.CONTAINED_CONTAINER__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int GROUP__LABEL = VViewPackage.CONTAINED_CONTAINER__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -146,6 +156,18 @@ public interface VGroupPackage extends EPackage
 	int GROUP__ATTACHMENTS = VViewPackage.CONTAINED_CONTAINER__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int GROUP__UUID = VViewPackage.CONTAINED_CONTAINER__UUID;
+
+	/**
 	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -156,16 +178,27 @@ public interface VGroupPackage extends EPackage
 	int GROUP__CHILDREN = VViewPackage.CONTAINED_CONTAINER__CHILDREN;
 
 	/**
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int GROUP__TOOLTIP = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 0;
+
+	/**
 	 * The feature id for the '<em><b>Group Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
-	int GROUP__GROUP_TYPE = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 0;
+	int GROUP__GROUP_TYPE = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Label Alignment</b></em>' attribute.
@@ -173,11 +206,10 @@ public interface VGroupPackage extends EPackage
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
-	int GROUP__LABEL_ALIGNMENT = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 1;
+	int GROUP__LABEL_ALIGNMENT = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
@@ -185,11 +217,10 @@ public interface VGroupPackage extends EPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
-	int GROUP__COLLAPSED = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 2;
+	int GROUP__COLLAPSED = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 3;
 
 	/**
 	 * The number of structural features of the '<em>Group</em>' class.
@@ -199,7 +230,7 @@ public interface VGroupPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int GROUP_FEATURE_COUNT = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 3;
+	int GROUP_FEATURE_COUNT = VViewPackage.CONTAINED_CONTAINER_FEATURE_COUNT + 4;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.group.model.GroupType <em>Type</em>}' enum.
@@ -207,7 +238,6 @@ public interface VGroupPackage extends EPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupType
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupPackageImpl#getGroupType()
 	 * @generated
@@ -215,13 +245,12 @@ public interface VGroupPackage extends EPackage
 	int GROUP_TYPE = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment
-	 * <em>Label Alignment</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment <em>Label
+	 * Alignment</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupPackageImpl#getGroupLabelAlignment()
 	 * @generated
@@ -246,7 +275,6 @@ public interface VGroupPackage extends EPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Group Type</em>'.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.VGroup#getGroupType()
 	 * @see #getGroup()
@@ -255,13 +283,12 @@ public interface VGroupPackage extends EPackage
 	EAttribute getGroup_GroupType();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.spi.group.model.VGroup#getLabelAlignment <em>Label Alignment</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.spi.group.model.VGroup#getLabelAlignment <em>Label Alignment</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Label Alignment</em>'.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.VGroup#getLabelAlignment()
 	 * @see #getGroup()
@@ -276,7 +303,6 @@ public interface VGroupPackage extends EPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Collapsed</em>'.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.VGroup#isCollapsed()
 	 * @see #getGroup()
@@ -290,7 +316,6 @@ public interface VGroupPackage extends EPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the meta object for enum '<em>Type</em>'.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupType
 	 * @generated
@@ -298,13 +323,12 @@ public interface VGroupPackage extends EPackage
 	EEnum getGroupType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment
-	 * <em>Label Alignment</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment <em>Label
+	 * Alignment</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the meta object for enum '<em>Label Alignment</em>'.
 	 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment
 	 * @generated
@@ -334,11 +358,9 @@ public interface VGroupPackage extends EPackage
 	 * @noimplement This interface is not intended to be implemented by clients.
 	 * @noextend This interface is not intended to be extended by clients.
 	 *           <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
-	interface Literals
-	{
+	interface Literals {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupImpl
 		 * <em>Group</em>}' class.
@@ -356,7 +378,6 @@ public interface VGroupPackage extends EPackage
 		 *
 		 * @since 1.4
 		 *        <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute GROUP__GROUP_TYPE = eINSTANCE.getGroup_GroupType();
@@ -366,7 +387,6 @@ public interface VGroupPackage extends EPackage
 		 *
 		 * @since 1.3
 		 *        <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute GROUP__LABEL_ALIGNMENT = eINSTANCE.getGroup_LabelAlignment();
@@ -376,7 +396,6 @@ public interface VGroupPackage extends EPackage
 		 *
 		 * @since 1.4
 		 *        <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute GROUP__COLLAPSED = eINSTANCE.getGroup_Collapsed();
@@ -387,7 +406,6 @@ public interface VGroupPackage extends EPackage
 		 *
 		 * @since 1.4
 		 *        <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupType
 		 * @see org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupPackageImpl#getGroupType()
 		 * @generated
@@ -400,7 +418,6 @@ public interface VGroupPackage extends EPackage
 		 *
 		 * @since 1.3
 		 *        <!-- end-user-doc -->
-		 *
 		 * @see org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment
 		 * @see org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupPackageImpl#getGroupLabelAlignment()
 		 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupFactoryImpl.java
index 15cd0883f7..cd3945db1a 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupFactoryImpl.java
@@ -27,30 +27,25 @@ import org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
-{
+public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static VGroupFactory init()
-	{
-		try
-		{
-			final VGroupFactory theGroupFactory = (VGroupFactory) EPackage.Registry.INSTANCE
+	public static VGroupFactory init() {
+		try {
+			VGroupFactory theGroupFactory = (VGroupFactory) EPackage.Registry.INSTANCE
 				.getEFactory(VGroupPackage.eNS_URI);
-			if (theGroupFactory != null)
-			{
+			if (theGroupFactory != null) {
 				return theGroupFactory;
 			}
-		} catch (final Exception exception)
-		{
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new VGroupFactoryImpl();
@@ -60,25 +55,22 @@ public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public VGroupFactoryImpl()
-	{
+	public VGroupFactoryImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
 		case VGroupPackage.GROUP:
 			return createGroup();
 		default:
@@ -89,14 +81,12 @@ public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object createFromString(EDataType eDataType, String initialValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
 		case VGroupPackage.GROUP_TYPE:
 			return createGroupTypeFromString(eDataType, initialValue);
 		case VGroupPackage.GROUP_LABEL_ALIGNMENT:
@@ -109,14 +99,12 @@ public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue)
-	{
-		switch (eDataType.getClassifierID())
-		{
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
 		case VGroupPackage.GROUP_TYPE:
 			return convertGroupTypeToString(eDataType, instanceValue);
 		case VGroupPackage.GROUP_LABEL_ALIGNMENT:
@@ -129,13 +117,12 @@ public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VGroup createGroup()
-	{
-		final VGroupImpl group = new VGroupImpl();
+	public VGroup createGroup() {
+		VGroupImpl group = new VGroupImpl();
 		return group;
 	}
 
@@ -144,17 +131,13 @@ public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
-	public GroupType createGroupTypeFromString(EDataType eDataType, String initialValue)
-	{
-		final GroupType result = GroupType.get(initialValue);
+	public GroupType createGroupTypeFromString(EDataType eDataType, String initialValue) {
+		GroupType result = GroupType.get(initialValue);
 		if (result == null)
-		{
 			throw new IllegalArgumentException(
 				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
 		return result;
 	}
 
@@ -163,28 +146,23 @@ public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
-	public String convertGroupTypeToString(EDataType eDataType, Object instanceValue)
-	{
+	public String convertGroupTypeToString(EDataType eDataType, Object instanceValue) {
 		return instanceValue == null ? null : instanceValue.toString();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public GroupLabelAlignment createGroupLabelAlignmentFromString(EDataType eDataType, String initialValue)
-	{
-		final GroupLabelAlignment result = GroupLabelAlignment.get(initialValue);
+	public GroupLabelAlignment createGroupLabelAlignmentFromString(EDataType eDataType, String initialValue) {
+		GroupLabelAlignment result = GroupLabelAlignment.get(initialValue);
 		if (result == null)
-		{
 			throw new IllegalArgumentException(
 				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
 		return result;
 	}
 
@@ -193,36 +171,32 @@ public class VGroupFactoryImpl extends EFactoryImpl implements VGroupFactory
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
-	public String convertGroupLabelAlignmentToString(EDataType eDataType, Object instanceValue)
-	{
+	public String convertGroupLabelAlignmentToString(EDataType eDataType, Object instanceValue) {
 		return instanceValue == null ? null : instanceValue.toString();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VGroupPackage getGroupPackage()
-	{
+	public VGroupPackage getGroupPackage() {
 		return (VGroupPackage) getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
 	@Deprecated
-	public static VGroupPackage getPackage()
-	{
+	public static VGroupPackage getPackage() {
 		return VGroupPackage.eINSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupImpl.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupImpl.java
index 39f0274db7..82e96c958e 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupImpl.java
@@ -18,6 +18,8 @@ import org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment;
 import org.eclipse.emf.ecp.view.spi.group.model.GroupType;
 import org.eclipse.emf.ecp.view.spi.group.model.VGroup;
 import org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.model.impl.VContainedContainerImpl;
 
 /**
@@ -28,25 +30,46 @@ import org.eclipse.emf.ecp.view.spi.model.impl.VContainedContainerImpl;
  *        <!-- end-user-doc -->
  *        <p>
  *        The following features are implemented:
+ *        </p>
  *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupImpl#getTooltip <em>Tooltip</em>}</li>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupImpl#getGroupType <em>Group Type</em>}</li>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupImpl#getLabelAlignment <em>Label Alignment
- *        </em>}</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupImpl#getLabelAlignment <em>Label
+ *        Alignment</em>}</li>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.group.model.impl.VGroupImpl#isCollapsed <em>Collapsed</em>}</li>
  *        </ul>
- *        </p>
  *
  * @generated
  */
-public class VGroupImpl extends VContainedContainerImpl implements VGroup
-{
+public class VGroupImpl extends VContainedContainerImpl implements VGroup {
+	/**
+	 * The default value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 * @since 1.13
+	 */
+	protected static final String TOOLTIP_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 * @since 1.13
+	 */
+	protected String tooltip = TOOLTIP_EDEFAULT;
 	/**
 	 * The default value of the '{@link #getGroupType() <em>Group Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #getGroupType()
 	 * @generated
 	 * @ordered
@@ -58,7 +81,6 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #getGroupType()
 	 * @generated
 	 * @ordered
@@ -70,7 +92,6 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #getLabelAlignment()
 	 * @generated
 	 * @ordered
@@ -82,7 +103,6 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #getLabelAlignment()
 	 * @generated
 	 * @ordered
@@ -95,7 +115,6 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
@@ -107,7 +126,6 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #isCollapsed()
 	 * @generated
 	 * @ordered
@@ -120,8 +138,7 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @generated
 	 */
-	protected VGroupImpl()
-	{
+	protected VGroupImpl() {
 		super();
 	}
 
@@ -132,22 +149,47 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VGroupPackage.Literals.GROUP;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @since 1.13
+	 */
+	@Override
+	public String getTooltip() {
+		return tooltip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @since 1.13
+	 */
+	@Override
+	public void setTooltip(String newTooltip) {
+		final String oldTooltip = tooltip;
+		tooltip = newTooltip;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, VGroupPackage.GROUP__TOOLTIP, oldTooltip, tooltip));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public GroupType getGroupType()
-	{
+	public GroupType getGroupType() {
 		return groupType;
 	}
 
@@ -156,12 +198,10 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public void setGroupType(GroupType newGroupType)
-	{
+	public void setGroupType(GroupType newGroupType) {
 		final GroupType oldGroupType = groupType;
 		groupType = newGroupType == null ? GROUP_TYPE_EDEFAULT : newGroupType;
 		if (eNotificationRequired()) {
@@ -175,12 +215,10 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public GroupLabelAlignment getLabelAlignment()
-	{
+	public GroupLabelAlignment getLabelAlignment() {
 		return labelAlignment;
 	}
 
@@ -189,12 +227,10 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public void setLabelAlignment(GroupLabelAlignment newLabelAlignment)
-	{
+	public void setLabelAlignment(GroupLabelAlignment newLabelAlignment) {
 		final GroupLabelAlignment oldLabelAlignment = labelAlignment;
 		labelAlignment = newLabelAlignment == null ? LABEL_ALIGNMENT_EDEFAULT : newLabelAlignment;
 		if (eNotificationRequired()) {
@@ -208,12 +244,10 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public boolean isCollapsed()
-	{
+	public boolean isCollapsed() {
 		return collapsed;
 	}
 
@@ -222,17 +256,15 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public void setCollapsed(boolean newCollapsed)
-	{
+	public void setCollapsed(boolean newCollapsed) {
 		final boolean oldCollapsed = collapsed;
 		collapsed = newCollapsed;
 		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, VGroupPackage.GROUP__COLLAPSED, oldCollapsed,
-				collapsed));
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, VGroupPackage.GROUP__COLLAPSED, oldCollapsed, collapsed));
 		}
 	}
 
@@ -243,10 +275,10 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case VGroupPackage.GROUP__TOOLTIP:
+			return getTooltip();
 		case VGroupPackage.GROUP__GROUP_TYPE:
 			return getGroupType();
 		case VGroupPackage.GROUP__LABEL_ALIGNMENT:
@@ -264,10 +296,11 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 * @generated
 	 */
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case VGroupPackage.GROUP__TOOLTIP:
+			setTooltip((String) newValue);
+			return;
 		case VGroupPackage.GROUP__GROUP_TYPE:
 			setGroupType((GroupType) newValue);
 			return;
@@ -288,10 +321,11 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case VGroupPackage.GROUP__TOOLTIP:
+			setTooltip(TOOLTIP_EDEFAULT);
+			return;
 		case VGroupPackage.GROUP__GROUP_TYPE:
 			setGroupType(GROUP_TYPE_EDEFAULT);
 			return;
@@ -312,10 +346,10 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case VGroupPackage.GROUP__TOOLTIP:
+			return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
 		case VGroupPackage.GROUP__GROUP_TYPE:
 			return groupType != GROUP_TYPE_EDEFAULT;
 		case VGroupPackage.GROUP__LABEL_ALIGNMENT:
@@ -333,14 +367,53 @@ public class VGroupImpl extends VContainedContainerImpl implements VGroup
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == VHasTooltip.class) {
+			switch (derivedFeatureID) {
+			case VGroupPackage.GROUP__TOOLTIP:
+				return VViewPackage.HAS_TOOLTIP__TOOLTIP;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == VHasTooltip.class) {
+			switch (baseFeatureID) {
+			case VViewPackage.HAS_TOOLTIP__TOOLTIP:
+				return VGroupPackage.GROUP__TOOLTIP;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
 		if (eIsProxy()) {
 			return super.toString();
 		}
 
 		final StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (groupType: "); //$NON-NLS-1$
+		result.append(" (tooltip: "); //$NON-NLS-1$
+		result.append(tooltip);
+		result.append(", groupType: "); //$NON-NLS-1$
 		result.append(groupType);
 		result.append(", labelAlignment: "); //$NON-NLS-1$
 		result.append(labelAlignment);
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupPackageImpl.java
index fe9a100b24..04359ba9a0 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/impl/VGroupPackageImpl.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecp.view.spi.group.model.GroupLabelAlignment;
 import org.eclipse.emf.ecp.view.spi.group.model.GroupType;
@@ -28,15 +27,14 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
-{
+public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass groupEClass = null;
@@ -44,7 +42,7 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EEnum groupTypeEEnum = null;
@@ -52,7 +50,7 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EEnum groupLabelAlignmentEEnum = null;
@@ -71,42 +69,40 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	 * @see #init()
 	 * @generated
 	 */
-	private VGroupPackageImpl()
-	{
+	private VGroupPackageImpl() {
 		super(eNS_URI, VGroupFactory.eINSTANCE);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * 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 VGroupPackage#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 -->
+	 * This method is used to initialize {@link VGroupPackage#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 -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static VGroupPackage init()
-	{
-		if (isInited) {
+	public static VGroupPackage init() {
+		if (isInited)
 			return (VGroupPackage) EPackage.Registry.INSTANCE.getEPackage(VGroupPackage.eNS_URI);
-		}
 
 		// Obtain or create and register package
-		final VGroupPackageImpl theGroupPackage = (VGroupPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VGroupPackageImpl ? EPackage.Registry.INSTANCE
-			.get(eNS_URI)
-			: new VGroupPackageImpl());
+		VGroupPackageImpl theGroupPackage = (VGroupPackageImpl) (EPackage.Registry.INSTANCE
+			.get(eNS_URI) instanceof VGroupPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new VGroupPackageImpl());
 
 		isInited = true;
 
@@ -130,12 +126,11 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getGroup()
-	{
+	public EClass getGroup() {
 		return groupEClass;
 	}
 
@@ -144,12 +139,10 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public EAttribute getGroup_GroupType()
-	{
+	public EAttribute getGroup_GroupType() {
 		return (EAttribute) groupEClass.getEStructuralFeatures().get(0);
 	}
 
@@ -158,12 +151,10 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	 *
 	 * @since 1.3
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public EAttribute getGroup_LabelAlignment()
-	{
+	public EAttribute getGroup_LabelAlignment() {
 		return (EAttribute) groupEClass.getEStructuralFeatures().get(1);
 	}
 
@@ -172,12 +163,10 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public EAttribute getGroup_Collapsed()
-	{
+	public EAttribute getGroup_Collapsed() {
 		return (EAttribute) groupEClass.getEStructuralFeatures().get(2);
 	}
 
@@ -186,43 +175,39 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
-	public EEnum getGroupType()
-	{
+	public EEnum getGroupType() {
 		return groupTypeEEnum;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EEnum getGroupLabelAlignment()
-	{
+	public EEnum getGroupLabelAlignment() {
 		return groupLabelAlignmentEEnum;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VGroupFactory getGroupFactory()
-	{
+	public VGroupFactory getGroupFactory() {
 		return (VGroupFactory) getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -232,14 +217,12 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void createPackageContents()
-	{
-		if (isCreated) {
+	public void createPackageContents() {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -256,7 +239,7 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -266,14 +249,12 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void initializePackageContents()
-	{
-		if (isInitialized) {
+	public void initializePackageContents() {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -282,9 +263,7 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		final VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
-		final EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE
-			.getEPackage(EcorePackage.eNS_URI);
+		VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -292,21 +271,17 @@ public class VGroupPackageImpl extends EPackageImpl implements VGroupPackage
 
 		// Add supertypes to classes
 		groupEClass.getESuperTypes().add(theViewPackage.getContainedContainer());
+		groupEClass.getESuperTypes().add(theViewPackage.getHasTooltip());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(groupEClass, VGroup.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getGroup_GroupType(),
-			getGroupType(),
-			"groupType", null, 1, 1, VGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getGroup_LabelAlignment(),
-			getGroupLabelAlignment(),
-			"labelAlignment", "LabelAligned", 0, 1, VGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-			getGroup_Collapsed(),
-			theEcorePackage.getEBoolean(),
-			"collapsed", null, 0, 1, VGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getGroup_GroupType(), this.getGroupType(), "groupType", null, 1, 1, VGroup.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getGroup_LabelAlignment(), this.getGroupLabelAlignment(), "labelAlignment", "LabelAligned", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+			VGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEAttribute(getGroup_Collapsed(), ecorePackage.getEBoolean(), "collapsed", null, 0, 1, VGroup.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Initialize enums and add enum literals
 		initEEnum(groupTypeEEnum, GroupType.class, "GroupType"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupAdapterFactory.java
index 3641a54ed8..3fb2dc4ebd 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupAdapterFactory.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedContainer;
 import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
 import org.eclipse.emf.ecp.view.spi.model.VContainer;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 
 /**
  * <!-- begin-user-doc -->
@@ -49,8 +50,7 @@ public class GroupAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	public GroupAdapterFactory() {
-		if (modelPackage == null)
-		{
+		if (modelPackage == null) {
 			modelPackage = VGroupPackage.eINSTANCE;
 		}
 	}
@@ -67,12 +67,10 @@ public class GroupAdapterFactory extends AdapterFactoryImpl {
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage)
-		{
+		if (object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject)
-		{
+		if (object instanceof EObject) {
 			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -85,45 +83,42 @@ public class GroupAdapterFactory extends AdapterFactoryImpl {
 	 *
 	 * @generated
 	 */
-	protected GroupSwitch<Adapter> modelSwitch =
-		new GroupSwitch<Adapter>()
-		{
-			@Override
-			public Adapter caseGroup(VGroup object)
-			{
-				return createGroupAdapter();
-			}
-
-			@Override
-			public Adapter caseElement(VElement object)
-			{
-				return createElementAdapter();
-			}
-
-			@Override
-			public Adapter caseContainedElement(VContainedElement object)
-			{
-				return createContainedElementAdapter();
-			}
-
-			@Override
-			public Adapter caseContainer(VContainer object)
-			{
-				return createContainerAdapter();
-			}
-
-			@Override
-			public Adapter caseContainedContainer(VContainedContainer object)
-			{
-				return createContainedContainerAdapter();
-			}
-
-			@Override
-			public Adapter defaultCase(EObject object)
-			{
-				return createEObjectAdapter();
-			}
-		};
+	protected GroupSwitch<Adapter> modelSwitch = new GroupSwitch<Adapter>() {
+		@Override
+		public Adapter caseGroup(VGroup object) {
+			return createGroupAdapter();
+		}
+
+		@Override
+		public Adapter caseElement(VElement object) {
+			return createElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContainedElement(VContainedElement object) {
+			return createContainedElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContainer(VContainer object) {
+			return createContainerAdapter();
+		}
+
+		@Override
+		public Adapter caseContainedContainer(VContainedContainer object) {
+			return createContainedContainerAdapter();
+		}
+
+		@Override
+		public Adapter caseHasTooltip(VHasTooltip object) {
+			return createHasTooltipAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
@@ -167,8 +162,7 @@ public class GroupAdapterFactory extends AdapterFactoryImpl {
 	 * @see org.eclipse.emf.ecp.view.spi.model.VElement
 	 * @generated
 	 */
-	public Adapter createElementAdapter()
-	{
+	public Adapter createElementAdapter() {
 		return null;
 	}
 
@@ -184,8 +178,7 @@ public class GroupAdapterFactory extends AdapterFactoryImpl {
 	 * @see org.eclipse.emf.ecp.view.spi.model.VContainedElement
 	 * @generated
 	 */
-	public Adapter createContainedElementAdapter()
-	{
+	public Adapter createContainedElementAdapter() {
 		return null;
 	}
 
@@ -201,8 +194,7 @@ public class GroupAdapterFactory extends AdapterFactoryImpl {
 	 * @see org.eclipse.emf.ecp.view.spi.model.VContainer
 	 * @generated
 	 */
-	public Adapter createContainerAdapter()
-	{
+	public Adapter createContainerAdapter() {
 		return null;
 	}
 
@@ -215,13 +207,29 @@ public class GroupAdapterFactory extends AdapterFactoryImpl {
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VContainedContainer
 	 * @generated
 	 */
-	public Adapter createContainedContainerAdapter()
-	{
+	public Adapter createContainedContainerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip <em>Has
+	 * Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip
+	 * @generated
+	 */
+	public Adapter createHasTooltipAdapter() {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupSwitch.java b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupSwitch.java
index 32b85837e1..49e3258fe6 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupSwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/src/org/eclipse/emf/ecp/view/spi/group/model/util/GroupSwitch.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedContainer;
 import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
 import org.eclipse.emf.ecp.view.spi.model.VContainer;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 
 /**
  * <!-- begin-user-doc -->
@@ -53,8 +54,7 @@ public class GroupSwitch<T> extends Switch<T> {
 	 * @generated
 	 */
 	public GroupSwitch() {
-		if (modelPackage == null)
-		{
+		if (modelPackage == null) {
 			modelPackage = VGroupPackage.eINSTANCE;
 		}
 	}
@@ -64,7 +64,7 @@ public class GroupSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
@@ -84,8 +84,7 @@ public class GroupSwitch<T> extends Switch<T> {
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID)
-		{
+		switch (classifierID) {
 		case VGroupPackage.GROUP: {
 			final VGroup group = (VGroup) theEObject;
 			T result = caseGroup(group);
@@ -93,6 +92,9 @@ public class GroupSwitch<T> extends Switch<T> {
 				result = caseContainedContainer(group);
 			}
 			if (result == null) {
+				result = caseHasTooltip(group);
+			}
+			if (result == null) {
 				result = caseContainedElement(group);
 			}
 			if (result == null) {
@@ -123,8 +125,7 @@ public class GroupSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseGroup(VGroup object)
-	{
+	public T caseGroup(VGroup object) {
 		return null;
 	}
 
@@ -140,8 +141,7 @@ public class GroupSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseElement(VElement object)
-	{
+	public T caseElement(VElement object) {
 		return null;
 	}
 
@@ -157,8 +157,7 @@ public class GroupSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseContainedElement(VContainedElement object)
-	{
+	public T caseContainedElement(VContainedElement object) {
 		return null;
 	}
 
@@ -174,8 +173,7 @@ public class GroupSwitch<T> extends Switch<T> {
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseContainer(VContainer object)
-	{
+	public T caseContainer(VContainer object) {
 		return null;
 	}
 
@@ -187,14 +185,29 @@ public class GroupSwitch<T> extends Switch<T> {
 	 *
 	 * @since 1.4
 	 *        <!-- end-user-doc -->
-	 *
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Contained Container</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseContainedContainer(VContainedContainer object)
-	{
+	public T caseContainedContainer(VContainedContainer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 * @since 1.13
+	 */
+	public T caseHasTooltip(VHasTooltip object) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
index 3d4cfb90ad..2a089e54b2 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
@@ -2,22 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Collapsable Group
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.collapsable
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jface;bundle-version="[3.3.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml
index b6f42d71bf..2ea3bfda84 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java
index 160a579c1a..5f8e35478a 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/src/org/eclipse/emf/ecp/view/group/swt/internal/collapsable/CollapsableGroupSWTRenderer.java
@@ -34,9 +34,11 @@ import org.eclipse.jface.databinding.swt.ISWTObservableValue;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.FontDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ExpandEvent;
 import org.eclipse.swt.events.ExpandListener;
+import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -104,6 +106,10 @@ public class CollapsableGroupSWTRenderer extends ContainerSWTRenderer<VGroup> {
 		final ExpandItem item0 = new ExpandItem(bar, SWT.NONE, 0);
 		bar.setInitialHeaderHeight(item0.getHeaderHeight());
 
+		final FontDescriptor boldDescriptor = FontDescriptor.createFrom(bar.getFont()).setStyle(SWT.BOLD);
+		final Font boldFont = boldDescriptor.createFont(bar.getDisplay());
+		bar.setFont(boldFont);
+
 		final ISWTObservableValue target = WidgetProperties.text().observe(item0);
 		final IObservableValue modelValue = EMFEditObservables.observeValue(
 			AdapterFactoryEditingDomain.getEditingDomainFor(getVElement()), getVElement(),
@@ -229,6 +235,7 @@ public class CollapsableGroupSWTRenderer extends ContainerSWTRenderer<VGroup> {
 					}
 				}
 			}
+			sizeComputedByBar.x = sizeComputedByBar.x + 2 * MARGIN;
 			return sizeComputedByBar;
 		}
 	}
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
index 9d41df52c9..d9639eba1e 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Collapsible Group Renderer using PGroup
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.nebula.widgets.pgroup;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml
index 9ff3d040fc..8b42781728 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
index ff44078358..dc0fba2230 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AlignmentGroup SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.embedded
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml
index 44f64395ff..6eb1248641 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
index 9730c7aaf3..e85aee75a4 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Group UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.ui.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.12.0",
- org.eclipse.emfforms.internal.group.swt;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.13.0",
+ org.eclipse.emfforms.internal.group.swt;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml
index 3f337e2c42..524d97857c 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java
index 059e0af4c0..2e8710943b 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/src/org/eclipse/emf/ecp/view/spi/group/swt/GroupSWTRenderer.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
 import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.swt.layout.LayoutProviderHelper;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emfforms.internal.group.swt.GroupTextProperty;
 import org.eclipse.emfforms.spi.common.report.ReportService;
 import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
@@ -32,6 +33,8 @@ import org.eclipse.emfforms.spi.swt.core.EMFFormsRendererFactory;
 import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
 import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
 import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
+import org.eclipse.jface.databinding.swt.ISWTObservableValue;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;
@@ -96,14 +99,22 @@ public class GroupSWTRenderer extends ContainerSWTRenderer<VGroup> {
 	@Override
 	protected Composite getComposite(Composite parent) {
 		final Group group = new Group(parent, SWT.TITLE);
-		final IObservableValue modelValue = EMFEditObservables.observeValue(
-			AdapterFactoryEditingDomain.getEditingDomainFor(getVElement()), getVElement(),
+		final EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(getVElement());
+		final IObservableValue modelLabelValue = EMFEditObservables.observeValue(
+			editingDomain,
+			getVElement(),
 			VViewPackage.eINSTANCE.getElement_Label());
-		final IObservableValue targetValue = new GroupTextProperty().observe(group);
+		final IObservableValue targetLabelValue = new GroupTextProperty().observe(group);
 		// FIXME fixed with JFace-Databinding 4.5
 		// final IObservableValue targetValue = SWTObservables.observeText(group);
-
-		dbc.bindValue(targetValue, modelValue);
+		dbc.bindValue(targetLabelValue, modelLabelValue);
+
+		final IObservableValue modelTooltipValue = EMFEditObservables.observeValue(
+			editingDomain,
+			getVElement(),
+			VViewPackage.eINSTANCE.getHasTooltip_Tooltip());
+		final ISWTObservableValue targetTooltipValue = WidgetProperties.tooltipText().observe(group);
+		dbc.bindValue(targetTooltipValue, modelTooltipValue);
 
 		return group;
 	}
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
index f021e97c5d..b28462337a 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider.GroupedGridEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml
index 56b639b534..d80c4cb9a9 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.groupedgrid.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
index 2c2fc1d185..ebf0ed070e 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml
index 7a3971ffab..54e12f687e 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.groupedgrid.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
index 179776935a..066f323ac5 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Grouped Grid UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.ui.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml
index 25ba7e4366..405fe4e607 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
index d81b03de43..eeeb0f9b9a 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.horizontal.model.provider.HorizontalEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml
index 77bac32a53..ca5bfad1af 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.horizontal.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
index f231d3b5a9..5c6237d375 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Horizontal View Model
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml
index 6f42a2899a..274acfc7fb 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.horizontal.model</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
index 600d446b66..08406b57c2 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Horizontal UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.internal.core.swt;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.internal.core.swt;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml
index 36119b1706..794aeb69fd 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
index 77cf4c3bb8..6839003008 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider.IndexdmrEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml
index eabcc6d463..7fcf6d59aa 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
index d6611dfed6..18501c19ee 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml
index b1f48d37aa..c3e99968d6 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
index 9338290229..5edd205f02 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Index DMR Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.tooling;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.indexdmr.tooling.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml
index daa6d99eda..a49d892f8f 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
index d91c55d68d..9164da5daa 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider.KeyattributedmrEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml
index 17797dbbf5..659de4475e 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
index 6756a3f261..7dad6fae69 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml
index 628694d310..1263201a91 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
index 88f4c3797d..53525cb920 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Key Attribute DMR Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.tooling;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.keyattributedmr.tooling.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.dialogs;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml
index 534d5e8407..5710394fcc 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
index 64c8e79193..3db6887c2a 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.label.model.provider.LabelEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.label.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml
index 56bbb857ed..629ec9eee3 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.label.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

 

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
index b718759e49..6b9a213043 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.label.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.label.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml
index 703be36618..79c395e56f 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.label.model</artifactId>

   <packaging>eclipse-plugin</packaging>

 

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
index e355b4ba2a..84d6546fb3 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Label Rap
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.rap
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.13.0,1.14.0)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
 Service-Component: OSGI-INF/labelRAPRendererService.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml
index c3dc8b31e7..11545b11cd 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.label.rap</artifactId>

   <packaging>eclipse-plugin</packaging>

 

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
index ab87607912..62a4984da7 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Label UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.ui.swt
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.label.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.label.swt;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml
index b02ed87a62..b86cbfb98f 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
index eef3bba851..5c2e3f1b46 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider.MappingdmrEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml
index c27688a4f0..bb55d6e52b 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
index 9163a5a392..957bae9bfc 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml
index 0294d8b504..e6fc0320ca 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
index 03a108fe50..f6f131e3c5 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.tooling;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.mappingdmr.tooling.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.viewers;version="0.0.0",
  org.eclipse.jface.window;version="0.0.0",
  org.eclipse.jface.wizard;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml
index b4142a38e0..e51ad83cd1 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF
index 0a944e5d7d..cb1973fc19 100644
--- a/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.migrator/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Migrator
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.migrator;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.12.0",
- org.eclipse.emf.ecp.spi.view.migrator.string;version="1.12.0",
- org.eclipse.emf.ecp.view.migrator;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.13.0",
+ org.eclipse.emf.ecp.spi.view.migrator.string;version="1.13.0",
+ org.eclipse.emf.ecp.view.migrator;version="1.13.0"
 Require-Bundle: org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
index 9a260c022f..4500a4c7af 100644
--- a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.migrator</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
index 50a9223b58..66b7c887b5 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common View Model Classes for Dependency Injection
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common.di;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.common.di.messages;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.util;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.model.common.di.messages;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.util;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml
index e07da34a83..9fafca75a2 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
index 22d44ac44a..ce52d5d258 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common View Model Classes
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.model.common.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.model.common;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common;version="1.12.0",
- org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.common.callback;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.model.common;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common;version="1.13.0",
+ org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.common.callback;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml
index d2b5516f14..b84290d89c 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.common/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
index c8a6736589..1984071344 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Edapt Migration for Core View Model
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edapt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.1.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml
index 479c5e4d8a..320a51b98d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.edapt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/.project b/bundles/org.eclipse.emf.ecp.view.model.edit/.project
index 72187ad8fc..404f7407cb 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/.project
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.emf.ecp.view.model.edit</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.ecp.view.model.edit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.core.prefs
index 318049d1e1..796b3aba6b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,418 +1,418 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error

-org.eclipse.jdt.core.codeComplete.argumentPrefixes=

-org.eclipse.jdt.core.codeComplete.argumentSuffixes=

-org.eclipse.jdt.core.codeComplete.fieldPrefixes=

-org.eclipse.jdt.core.codeComplete.fieldSuffixes=

-org.eclipse.jdt.core.codeComplete.localPrefixes=

-org.eclipse.jdt.core.codeComplete.localSuffixes=

-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=

-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=

-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=

-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=

-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled

-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore

-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull

-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault

-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable

-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

-org.eclipse.jdt.core.compiler.problem.deadCode=warning

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled

-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore

-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning

-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore

-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning

-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled

-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning

-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error

-org.eclipse.jdt.core.compiler.problem.nullReference=warning

-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error

-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning

-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore

-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning

-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore

-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=warning

-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.6

-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled

-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL

-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=true

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert

-org.eclipse.jdt.core.formatter.comment.line_length=120

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=1

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=120

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=true

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-org.eclipse.jdt.core.incompleteClasspath=error

+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.ui.prefs
index 8553926909..8bc4bb4b36 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -1,127 +1,127 @@
-cleanup.add_default_serial_version_id=true

-cleanup.add_generated_serial_version_id=false

-cleanup.add_missing_annotations=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_missing_methods=false

-cleanup.add_missing_nls_tags=false

-cleanup.add_missing_override_annotations=true

-cleanup.add_missing_override_annotations_interface_methods=true

-cleanup.add_serial_version_id=false

-cleanup.always_use_blocks=true

-cleanup.always_use_parentheses_in_expressions=false

-cleanup.always_use_this_for_non_static_field_access=false

-cleanup.always_use_this_for_non_static_method_access=false

-cleanup.convert_functional_interfaces=false

-cleanup.convert_to_enhanced_for_loop=false

-cleanup.correct_indentation=false

-cleanup.format_source_code=true

-cleanup.format_source_code_changes_only=false

-cleanup.insert_inferred_type_arguments=false

-cleanup.make_local_variable_final=true

-cleanup.make_parameters_final=false

-cleanup.make_private_fields_final=true

-cleanup.make_type_abstract_if_missing_method=false

-cleanup.make_variable_declarations_final=true

-cleanup.never_use_blocks=false

-cleanup.never_use_parentheses_in_expressions=true

-cleanup.organize_imports=true

-cleanup.qualify_static_field_accesses_with_declaring_class=false

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

-cleanup.remove_private_constructors=true

-cleanup.remove_redundant_type_arguments=true

-cleanup.remove_trailing_whitespaces=true

-cleanup.remove_trailing_whitespaces_all=true

-cleanup.remove_trailing_whitespaces_ignore_empty=false

-cleanup.remove_unnecessary_casts=false

-cleanup.remove_unnecessary_nls_tags=false

-cleanup.remove_unused_imports=true

-cleanup.remove_unused_local_variables=false

-cleanup.remove_unused_private_fields=true

-cleanup.remove_unused_private_members=false

-cleanup.remove_unused_private_methods=true

-cleanup.remove_unused_private_types=true

-cleanup.sort_members=false

-cleanup.sort_members_all=false

-cleanup.use_anonymous_class_creation=false

-cleanup.use_blocks=true

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.use_lambda=true

-cleanup.use_parentheses_in_expressions=true

-cleanup.use_this_for_non_static_field_access=true

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-cleanup.use_this_for_non_static_method_access=true

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup.use_type_arguments=false

-cleanup_profile=_esmCleanUp

-cleanup_settings_version=2

-eclipse.preferences.version=1

-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true

-formatter_profile=_esmFormatter

-formatter_settings_version=12

-org.eclipse.jdt.ui.exception.name=ex

-org.eclipse.jdt.ui.gettersetter.use.is=true

-org.eclipse.jdt.ui.javadoc=true

-org.eclipse.jdt.ui.keywordthis=false

-org.eclipse.jdt.ui.overrideannotation=true

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

-sp_cleanup.add_default_serial_version_id=true

-sp_cleanup.add_generated_serial_version_id=false

-sp_cleanup.add_missing_annotations=true

-sp_cleanup.add_missing_deprecated_annotations=true

-sp_cleanup.add_missing_methods=false

-sp_cleanup.add_missing_nls_tags=false

-sp_cleanup.add_missing_override_annotations=true

-sp_cleanup.add_missing_override_annotations_interface_methods=true

-sp_cleanup.add_serial_version_id=false

-sp_cleanup.always_use_blocks=true

-sp_cleanup.always_use_parentheses_in_expressions=false

-sp_cleanup.always_use_this_for_non_static_field_access=false

-sp_cleanup.always_use_this_for_non_static_method_access=false

-sp_cleanup.convert_functional_interfaces=false

-sp_cleanup.convert_to_enhanced_for_loop=false

-sp_cleanup.correct_indentation=false

-sp_cleanup.format_source_code=true

-sp_cleanup.format_source_code_changes_only=false

-sp_cleanup.insert_inferred_type_arguments=false

-sp_cleanup.make_local_variable_final=true

-sp_cleanup.make_parameters_final=false

-sp_cleanup.make_private_fields_final=true

-sp_cleanup.make_type_abstract_if_missing_method=false

-sp_cleanup.make_variable_declarations_final=true

-sp_cleanup.never_use_blocks=false

-sp_cleanup.never_use_parentheses_in_expressions=true

-sp_cleanup.on_save_use_additional_actions=true

-sp_cleanup.organize_imports=true

-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false

-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true

-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false

-sp_cleanup.remove_private_constructors=true

-sp_cleanup.remove_redundant_type_arguments=false

-sp_cleanup.remove_trailing_whitespaces=true

-sp_cleanup.remove_trailing_whitespaces_all=true

-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false

-sp_cleanup.remove_unnecessary_casts=false

-sp_cleanup.remove_unnecessary_nls_tags=true

-sp_cleanup.remove_unused_imports=true

-sp_cleanup.remove_unused_local_variables=false

-sp_cleanup.remove_unused_private_fields=true

-sp_cleanup.remove_unused_private_members=false

-sp_cleanup.remove_unused_private_methods=true

-sp_cleanup.remove_unused_private_types=true

-sp_cleanup.sort_members=false

-sp_cleanup.sort_members_all=false

-sp_cleanup.use_anonymous_class_creation=false

-sp_cleanup.use_blocks=true

-sp_cleanup.use_blocks_only_for_return_and_throw=false

-sp_cleanup.use_lambda=false

-sp_cleanup.use_parentheses_in_expressions=true

-sp_cleanup.use_this_for_non_static_field_access=true

-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-sp_cleanup.use_this_for_non_static_method_access=true

-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-sp_cleanup.use_type_arguments=false

+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF
index b25681f5c1..12c22f7f81 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/build.properties b/bundles/org.eclipse.emf.ecp.view.model.edit/build.properties
index 9811208ae0..b686a6bcfc 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/build.properties
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/build.properties
@@ -1,12 +1,12 @@
-#

-

-bin.includes = .,\

-               icons/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties,\

-               about.html

-jars.compile.order = .

-source.. = src/

-output.. = bin/

-src.includes = about.html

+#
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+src.includes = about.html
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.properties b/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.properties
index a7b507a15e..292828eee1 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.properties
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.properties
@@ -177,3 +177,5 @@ _UI_DateTimeDisplayType_TimeAndDate_literal = TimeAndDate
 _UI_DateTimeDisplayType_TimeOnly_literal = TimeOnly
 _UI_DateTimeDisplayType_DateOnly_literal = DateOnly
 _UI_Element_uuid_feature = Uuid
+_UI_HasTooltip_type = Has Tooltip
+_UI_HasTooltip_tooltip_feature = Tooltip
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.xml b/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.xml
index 362f2ea33f..b94489377e 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/plugin.xml
@@ -1,22 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">

-      <!-- @generated view -->

-      <factory

-            uri="http://org/eclipse/emf/ecp/view/model/170"

-            class="org.eclipse.emf.ecp.view.spi.model.provider.ViewItemProviderAdapterFactory"

-            supportedTypes=

-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider

-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider

-               org.eclipse.emf.edit.provider.ITreeItemContentProvider

-               org.eclipse.emf.edit.provider.IItemLabelProvider

-               org.eclipse.emf.edit.provider.IItemPropertySource"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+   <extension
+         name=""
+         point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <factory
+            uri="http://org/eclipse/emf/ecp/view/model/170"
+            supportedTypes="org.eclipse.emf.edit.provider.IEditingDomainItemProvider                org.eclipse.emf.edit.provider.IStructuredItemContentProvider                org.eclipse.emf.edit.provider.ITreeItemContentProvider                org.eclipse.emf.edit.provider.IItemLabelProvider                org.eclipse.emf.edit.provider.IItemPropertySource"
+            class="org.eclipse.emf.ecp.view.spi.model.provider.ViewItemProviderAdapterFactory">
+      </factory>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
index 9f640a02d2..ffea7f6472 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-

-  <parent>

-    <groupId>org.eclipse.emf.ecp</groupId>

-    <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

-    <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

-  </parent>

-

-  <artifactId>org.eclipse.emf.ecp.view.model.edit</artifactId>

-  <packaging>eclipse-plugin</packaging>

-

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.emf.ecp</groupId>
+    <artifactId>ecp-bundles-parent</artifactId>
+    <version>1.13.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+  </parent>
+
+  <artifactId>org.eclipse.emf.ecp.view.model.edit</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/AttachmentItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/AttachmentItemProvider.java
index 800e2c6bd5..56e5ed0eaa 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/AttachmentItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/AttachmentItemProvider.java
@@ -29,9 +29,9 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VAttachment} object.
  * <!-- begin-user-doc -->
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
- *
+ *        <!-- end-user-doc -->
  * @generated
  */
 public class AttachmentItemProvider
@@ -43,7 +43,7 @@ public class AttachmentItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AttachmentItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +54,7 @@ public class AttachmentItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,7 +70,7 @@ public class AttachmentItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -83,7 +83,7 @@ public class AttachmentItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +97,7 @@ public class AttachmentItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -109,7 +109,7 @@ public class AttachmentItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedContainerItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedContainerItemProvider.java
index 34e9f8f89a..758cce83c8 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedContainerItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedContainerItemProvider.java
@@ -26,9 +26,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VContainedContainer} object.
  * <!-- begin-user-doc -->
+ * 
  * @since 1.4
- * <!-- end-user-doc -->
- *
+ *        <!-- end-user-doc -->
  * @generated
  */
 public class ContainedContainerItemProvider
@@ -37,7 +37,7 @@ public class ContainedContainerItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ContainedContainerItemProvider(AdapterFactory adapterFactory) {
@@ -48,7 +48,7 @@ public class ContainedContainerItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,7 +66,7 @@ public class ContainedContainerItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,7 +81,7 @@ public class ContainedContainerItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -96,14 +96,14 @@ public class ContainedContainerItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((VContainedContainer) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ContainedContainer_type") //$NON-NLS-1$
-			: getString("_UI_ContainedContainer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+		String label = ((VContainedContainer) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ContainedContainer_type") : //$NON-NLS-1$
+			getString("_UI_ContainedContainer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
@@ -111,7 +111,7 @@ public class ContainedContainerItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -131,7 +131,7 @@ public class ContainedContainerItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedElementItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedElementItemProvider.java
index 3cfaaaf9e7..913f8c554c 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedElementItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainedElementItemProvider.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VContainedElement} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ContainedElementItemProvider
@@ -32,7 +32,7 @@ public class ContainedElementItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ContainedElementItemProvider(AdapterFactory adapterFactory) {
@@ -43,7 +43,7 @@ public class ContainedElementItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -59,14 +59,14 @@ public class ContainedElementItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((VContainedElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_ContainedElement_type") //$NON-NLS-1$
-			: getString("_UI_ContainedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+		String label = ((VContainedElement) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_ContainedElement_type") : //$NON-NLS-1$
+			getString("_UI_ContainedElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
@@ -74,7 +74,7 @@ public class ContainedElementItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -88,7 +88,7 @@ public class ContainedElementItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainerItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainerItemProvider.java
index ae4ed48dd6..921ecbd96e 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainerItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ContainerItemProvider.java
@@ -26,9 +26,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VContainer} object.
  * <!-- begin-user-doc -->
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
- *
+ *        <!-- end-user-doc -->
  * @generated
  */
 public class ContainerItemProvider extends ElementItemProvider {
@@ -36,7 +36,7 @@ public class ContainerItemProvider extends ElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ContainerItemProvider(AdapterFactory adapterFactory) {
@@ -47,7 +47,7 @@ public class ContainerItemProvider extends ElementItemProvider {
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,7 +65,7 @@ public class ContainerItemProvider extends ElementItemProvider {
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,7 +80,7 @@ public class ContainerItemProvider extends ElementItemProvider {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,14 +95,14 @@ public class ContainerItemProvider extends ElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((VContainer) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Container_type") //$NON-NLS-1$
-			: getString("_UI_Container_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+		String label = ((VContainer) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_Container_type") : //$NON-NLS-1$
+			getString("_UI_Container_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
@@ -110,7 +110,7 @@ public class ContainerItemProvider extends ElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,7 +130,7 @@ public class ContainerItemProvider extends ElementItemProvider {
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ControlItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ControlItemProvider.java
index 4b67bf016f..9f7f554647 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ControlItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ControlItemProvider.java
@@ -39,7 +39,7 @@ public class ControlItemProvider extends ContainedElementItemProvider {
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ControlItemProvider(AdapterFactory adapterFactory) {
@@ -50,7 +50,7 @@ public class ControlItemProvider extends ContainedElementItemProvider {
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,7 +68,7 @@ public class ControlItemProvider extends ContainedElementItemProvider {
 	 * This adds a property descriptor for the Label Alignment feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addLabelAlignmentPropertyDescriptor(Object object) {
@@ -115,7 +115,7 @@ public class ControlItemProvider extends ContainedElementItemProvider {
 	 * This returns Control.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -146,7 +146,7 @@ public class ControlItemProvider extends ContainedElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,7 +167,7 @@ public class ControlItemProvider extends ContainedElementItemProvider {
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DateTimeDisplayAttachmentItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DateTimeDisplayAttachmentItemProvider.java
index 7c4acbc2b6..ab6d773060 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DateTimeDisplayAttachmentItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DateTimeDisplayAttachmentItemProvider.java
@@ -30,7 +30,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * 
  * @since 1.8
  *        <!-- end-user-doc -->
- *
  * @generated
  */
 public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvider {
@@ -38,7 +37,7 @@ public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvide
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public DateTimeDisplayAttachmentItemProvider(AdapterFactory adapterFactory) {
@@ -49,7 +48,7 @@ public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvide
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,7 +65,7 @@ public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvide
 	 * This adds a property descriptor for the Display Type feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addDisplayTypePropertyDescriptor(Object object) {
@@ -89,7 +88,7 @@ public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvide
 	 * This returns DateTimeDisplayAttachment.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,15 +100,15 @@ public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvide
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final DateTimeDisplayType labelValue = ((VDateTimeDisplayAttachment) object).getDisplayType();
-		final String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ? getString("_UI_DateTimeDisplayAttachment_type") //$NON-NLS-1$
-			: getString("_UI_DateTimeDisplayAttachment_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+		DateTimeDisplayType labelValue = ((VDateTimeDisplayAttachment) object).getDisplayType();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ? getString("_UI_DateTimeDisplayAttachment_type") : //$NON-NLS-1$
+			getString("_UI_DateTimeDisplayAttachment_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
@@ -117,7 +116,7 @@ public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvide
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,7 +136,7 @@ public class DateTimeDisplayAttachmentItemProvider extends AttachmentItemProvide
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DiagnosticItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DiagnosticItemProvider.java
index 3257973945..2769c5e3f5 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DiagnosticItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/DiagnosticItemProvider.java
@@ -34,9 +34,9 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VDiagnostic} object.
  * <!-- begin-user-doc -->
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
- *
+ *        <!-- end-user-doc -->
  * @generated
  */
 public class DiagnosticItemProvider
@@ -48,7 +48,7 @@ public class DiagnosticItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public DiagnosticItemProvider(AdapterFactory adapterFactory) {
@@ -59,7 +59,7 @@ public class DiagnosticItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,7 +76,7 @@ public class DiagnosticItemProvider
 	 * This adds a property descriptor for the Diagnostics feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addDiagnosticsPropertyDescriptor(Object object) {
@@ -99,7 +99,7 @@ public class DiagnosticItemProvider
 	 * This returns Diagnostic.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,7 +111,7 @@ public class DiagnosticItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -124,7 +124,7 @@ public class DiagnosticItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,7 +144,7 @@ public class DiagnosticItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,7 +156,7 @@ public class DiagnosticItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ElementItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ElementItemProvider.java
index f7bf1c8b8f..ade1c9143b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ElementItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ElementItemProvider.java
@@ -51,7 +51,7 @@ public class ElementItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ElementItemProvider(AdapterFactory adapterFactory) {
@@ -62,7 +62,7 @@ public class ElementItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,7 +84,7 @@ public class ElementItemProvider
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
@@ -129,7 +129,7 @@ public class ElementItemProvider
 	 * This adds a property descriptor for the Visible feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addVisiblePropertyDescriptor(Object object) {
@@ -151,7 +151,7 @@ public class ElementItemProvider
 	 * This adds a property descriptor for the Enabled feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addEnabledPropertyDescriptor(Object object) {
@@ -173,7 +173,7 @@ public class ElementItemProvider
 	 * This adds a property descriptor for the Readonly feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addReadonlyPropertyDescriptor(Object object) {
@@ -197,7 +197,6 @@ public class ElementItemProvider
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected void addUuidPropertyDescriptor(Object object) {
@@ -221,7 +220,7 @@ public class ElementItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -236,7 +235,7 @@ public class ElementItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -251,14 +250,14 @@ public class ElementItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((VElement) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Element_type") //$NON-NLS-1$
-			: getString("_UI_Element_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+		String label = ((VElement) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_Element_type") : //$NON-NLS-1$
+			getString("_UI_Element_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
@@ -303,7 +302,7 @@ public class ElementItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -318,7 +317,7 @@ public class ElementItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/FeaturePathDomainModelReferenceItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/FeaturePathDomainModelReferenceItemProvider.java
index fd2fd416c6..9de361cf55 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/FeaturePathDomainModelReferenceItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/FeaturePathDomainModelReferenceItemProvider.java
@@ -47,7 +47,7 @@ public class FeaturePathDomainModelReferenceItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public FeaturePathDomainModelReferenceItemProvider(AdapterFactory adapterFactory) {
@@ -58,7 +58,7 @@ public class FeaturePathDomainModelReferenceItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,7 +75,7 @@ public class FeaturePathDomainModelReferenceItemProvider
 	 * This adds a property descriptor for the Domain Model EFeature feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addDomainModelEFeaturePropertyDescriptor(Object object) {
@@ -99,7 +99,7 @@ public class FeaturePathDomainModelReferenceItemProvider
 	 * This returns FeaturePathDomainModelReference.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,7 +132,7 @@ public class FeaturePathDomainModelReferenceItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -146,7 +146,7 @@ public class FeaturePathDomainModelReferenceItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,7 +158,7 @@ public class FeaturePathDomainModelReferenceItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/StringToObjectMapEntryItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/StringToObjectMapEntryItemProvider.java
index 25f1c7ad62..6de2cdf41c 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/StringToObjectMapEntryItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/StringToObjectMapEntryItemProvider.java
@@ -51,7 +51,7 @@ public class StringToObjectMapEntryItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public StringToObjectMapEntryItemProvider(AdapterFactory adapterFactory) {
@@ -62,7 +62,7 @@ public class StringToObjectMapEntryItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,7 +80,7 @@ public class StringToObjectMapEntryItemProvider
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addKeyPropertyDescriptor(Object object) {
@@ -103,7 +103,7 @@ public class StringToObjectMapEntryItemProvider
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
@@ -126,7 +126,7 @@ public class StringToObjectMapEntryItemProvider
 	 * This returns StringToObjectMapEntry.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,12 +138,12 @@ public class StringToObjectMapEntryItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final Map.Entry<?, ?> stringToObjectMapEntry = (Map.Entry<?, ?>) object;
+		Map.Entry<?, ?> stringToObjectMapEntry = (Map.Entry<?, ?>) object;
 		return "" + stringToObjectMapEntry.getKey() + " -> " + stringToObjectMapEntry.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -152,7 +152,7 @@ public class StringToObjectMapEntryItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,7 +173,7 @@ public class StringToObjectMapEntryItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,7 +185,7 @@ public class StringToObjectMapEntryItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewEditPlugin.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewEditPlugin.java
index 09383d6655..25605522d1 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewEditPlugin.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewEditPlugin.java
@@ -28,7 +28,7 @@ public final class ViewEditPlugin extends EMFPlugin {
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final ViewEditPlugin INSTANCE = new ViewEditPlugin();
@@ -37,7 +37,7 @@ public final class ViewEditPlugin extends EMFPlugin {
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -46,7 +46,7 @@ public final class ViewEditPlugin extends EMFPlugin {
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ViewEditPlugin() {
@@ -59,7 +59,7 @@ public final class ViewEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -72,7 +72,7 @@ public final class ViewEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -84,7 +84,7 @@ public final class ViewEditPlugin extends EMFPlugin {
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipsePlugin {
@@ -92,7 +92,7 @@ public final class ViewEditPlugin extends EMFPlugin {
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProvider.java
index b97df4b34b..c7c0045989 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProvider.java
@@ -41,7 +41,7 @@ public class ViewItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ViewItemProvider(AdapterFactory adapterFactory) {
@@ -52,7 +52,7 @@ public class ViewItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,7 +70,7 @@ public class ViewItemProvider
 	 * This adds a property descriptor for the Root EClass feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addRootEClassPropertyDescriptor(Object object) {
@@ -117,7 +117,7 @@ public class ViewItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,7 +132,7 @@ public class ViewItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -147,7 +147,7 @@ public class ViewItemProvider
 	 * This returns View.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -178,7 +178,7 @@ public class ViewItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -201,7 +201,7 @@ public class ViewItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProviderAdapterFactory.java
index 132e0b2006..8ba9946d12 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewItemProviderAdapterFactory.java
@@ -54,7 +54,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -63,7 +63,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -72,7 +72,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This helps manage the child creation extenders.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
@@ -82,7 +82,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -91,7 +91,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ViewItemProviderAdapterFactory() {
@@ -107,7 +107,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected DiagnosticItemProvider diagnosticItemProvider;
@@ -116,7 +116,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VDiagnostic}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -132,7 +132,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.ecp.view.spi.model.VView} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ViewItemProvider viewItemProvider;
@@ -141,7 +141,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VView}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,7 +157,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.ecp.view.spi.model.VControl} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ControlItemProvider controlItemProvider;
@@ -166,7 +166,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VControl}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -193,7 +193,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,7 +219,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,7 +238,6 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * 
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	protected DateTimeDisplayAttachmentItemProvider dateTimeDisplayAttachmentItemProvider;
@@ -247,7 +246,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -264,7 +263,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * {@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected FeaturePathDomainModelReferenceItemProvider featurePathDomainModelReferenceItemProvider;
@@ -273,7 +272,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -289,7 +288,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -301,7 +300,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -312,7 +311,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -324,7 +323,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -335,14 +334,14 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
 		if (isFactoryForType(type)) {
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -353,7 +352,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public List<IChildCreationExtender> getChildCreationExtenders() {
@@ -363,7 +362,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -374,7 +373,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -386,7 +385,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -398,7 +397,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -410,7 +409,7 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -426,32 +425,25 @@ public class ViewItemProviderAdapterFactory extends ViewAdapterFactory implement
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void dispose() {
-		if (diagnosticItemProvider != null) {
+		if (diagnosticItemProvider != null)
 			diagnosticItemProvider.dispose();
-		}
-		if (featurePathDomainModelReferenceItemProvider != null) {
+		if (featurePathDomainModelReferenceItemProvider != null)
 			featurePathDomainModelReferenceItemProvider.dispose();
-		}
-		if (viewItemProvider != null) {
+		if (viewItemProvider != null)
 			viewItemProvider.dispose();
-		}
-		if (controlItemProvider != null) {
+		if (controlItemProvider != null)
 			controlItemProvider.dispose();
-		}
-		if (viewModelLoadingPropertiesItemProvider != null) {
+		if (viewModelLoadingPropertiesItemProvider != null)
 			viewModelLoadingPropertiesItemProvider.dispose();
-		}
-		if (stringToObjectMapEntryItemProvider != null) {
+		if (stringToObjectMapEntryItemProvider != null)
 			stringToObjectMapEntryItemProvider.dispose();
-		}
-		if (dateTimeDisplayAttachmentItemProvider != null) {
+		if (dateTimeDisplayAttachmentItemProvider != null)
 			dateTimeDisplayAttachmentItemProvider.dispose();
-		}
 	}
 
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewModelLoadingPropertiesItemProvider.java b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewModelLoadingPropertiesItemProvider.java
index 91c4af06bf..86526e4f1f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewModelLoadingPropertiesItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/src/org/eclipse/emf/ecp/view/spi/model/provider/ViewModelLoadingPropertiesItemProvider.java
@@ -52,7 +52,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ViewModelLoadingPropertiesItemProvider(AdapterFactory adapterFactory) {
@@ -63,7 +63,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,7 +81,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +97,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,7 +112,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * This returns ViewModelLoadingProperties.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -124,7 +124,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,7 +137,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -158,7 +158,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -178,16 +178,15 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		final Object childFeature = feature;
-		final Object childObject = child;
+		Object childFeature = feature;
+		Object childObject = child;
 
-		final boolean qualify = childFeature == VViewPackage.Literals.VIEW_MODEL_LOADING_PROPERTIES__INHERITABLE_PROPERTIES
-			||
+		boolean qualify = childFeature == VViewPackage.Literals.VIEW_MODEL_LOADING_PROPERTIES__INHERITABLE_PROPERTIES ||
 			childFeature == VViewPackage.Literals.VIEW_MODEL_LOADING_PROPERTIES__NON_INHERITABLE_PROPERTIES;
 
 		if (qualify) {
@@ -201,7 +200,7 @@ public class ViewModelLoadingPropertiesItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF
index b712bc0d18..18c6cafc92 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: New View Model Project Wizard
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.project.installer;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.model.internal.project.installer.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.internal.project.handlers;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.project.handlers;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml
index cfd603ec16..231b9320c6 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.project.installer</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/src/org/eclipse/emf/ecp/view/model/internal/project/installer/NewPluginProjectWizard.java b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/src/org/eclipse/emf/ecp/view/model/internal/project/installer/NewPluginProjectWizard.java
index 5ee6e6ae7c..f4de22ef08 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/src/org/eclipse/emf/ecp/view/model/internal/project/installer/NewPluginProjectWizard.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/src/org/eclipse/emf/ecp/view/model/internal/project/installer/NewPluginProjectWizard.java
@@ -55,8 +55,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecp.ide.spi.util.ViewModelHelper;
 import org.eclipse.emf.ecp.ide.view.service.IDEViewModelRegistry;
-import org.eclipse.emf.ecp.internal.ide.util.ViewModelHelper;
 import org.eclipse.emf.ecp.view.internal.editor.handler.ControlGenerator;
 import org.eclipse.emf.ecp.view.model.presentation.SelectEClassWizardPage;
 import org.eclipse.emf.ecp.view.model.presentation.SelectEcorePage;
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF
index 42817bf437..5b60d44e54 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.model.presentation.ViewEditorPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.model.actions;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.presentation;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer"
+Export-Package: org.eclipse.emf.ecp.view.model.actions;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.presentation;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)"
 Import-Package: org.eclipse.jface.wizard;version="0.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml
index ea4f6fcda9..41e5e12e8a 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/SelectEcorePage.java b/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/SelectEcorePage.java
index 07ca6a55e0..a44d7f8a5d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/SelectEcorePage.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/SelectEcorePage.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/ViewModelWizard.java b/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/ViewModelWizard.java
index e2f129f194..a4e7e9e208 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/ViewModelWizard.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/src/org/eclipse/emf/ecp/view/model/presentation/ViewModelWizard.java
@@ -41,8 +41,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecp.ide.spi.util.ViewModelHelper;
 import org.eclipse.emf.ecp.ide.view.service.IDEViewModelRegistry;
-import org.eclipse.emf.ecp.internal.ide.util.ViewModelHelper;
 import org.eclipse.emf.ecp.view.internal.editor.handler.ControlGenerator;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
diff --git a/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
index 718f808ebd..8ffe45057c 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Generator
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.generator;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml
index a0d53f9e7c..5a7ad57fcd 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/.classpath b/bundles/org.eclipse.emf.ecp.view.model.preview.common/.classpath
index 64c5e31b7a..ad32c83a78 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/.classpath
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.view.model.preview.common/.settings/org.eclipse.jdt.core.prefs
index 83b858013e..c94829777b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/.settings/org.eclipse.jdt.core.prefs
@@ -25,9 +25,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,7 +130,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF
index 71968a9a84..3e77650bf8 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Preview Common
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.common;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.model.preview.common.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.preview.common;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3,org.eclipse.emf.ecp.view.model.preview.e4"
+Export-Package: org.eclipse.emf.ecp.view.model.preview.common;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3,org.eclipse.emf.ecp.view.model.preview.e4"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.resources;version="0.0.0",
- org.eclipse.emf.ecp.ui.view.swt;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.13.0,1.14.0)",
  org.eclipse.jface;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/OSGI-INF/org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.common/OSGI-INF/org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider.xml
index 84d0b70791..357f2dcb75 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/OSGI-INF/org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/OSGI-INF/org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" deactivate="dispose" name="org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider">
    <service>
       <provide interface="org.eclipse.emf.ecp.view.spi.provider.IViewProvider"/>
       <provide interface="org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml
index 7f17b5ca70..e0d63aba45 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.preview.common</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/PreviewWorkspaceViewProvider.java b/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/PreviewWorkspaceViewProvider.java
index 84608234d1..2da4f3cb4e 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/PreviewWorkspaceViewProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.common/src/org/eclipse/emf/ecp/view/model/preview/common/PreviewWorkspaceViewProvider.java
@@ -15,6 +15,10 @@ import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -25,6 +29,7 @@ import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelProperties;
 import org.eclipse.emf.ecp.view.spi.provider.IViewProvider;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 
 /**
  * The IViewProvider provides views from the workspace.
@@ -36,14 +41,46 @@ import org.osgi.service.component.annotations.Component;
 public class PreviewWorkspaceViewProvider implements IViewProvider {
 
 	private final Map<IPath, VView> trackedPaths = new LinkedHashMap<IPath, VView>();
+	private IResourceChangeListener viewResourceChangeListener;
+
+	/** Constructor. */
+	public PreviewWorkspaceViewProvider() {
+		addViewResourceChangeListener();
+	}
+
+	private void addViewResourceChangeListener() {
+		viewResourceChangeListener = new IResourceChangeListener() {
+			@Override
+			public void resourceChanged(IResourceChangeEvent event) {
+				if (trackedPaths.isEmpty()) {
+					return;
+				}
+				IResourceDelta delta = event.getDelta();
+				if (delta != null) {
+					while (delta.getAffectedChildren().length != 0) {
+						delta = delta.getAffectedChildren()[0];
+					}
+					for (final IPath path : trackedPaths.keySet()) {
+						if (delta.getResource().getFullPath().equals(path)) {
+							// reload view
+							final VView view = loadView(path);
+							trackedPaths.put(path, view);
+						}
+					}
+				}
+			}
+		};
+		ResourcesPlugin.getWorkspace().addResourceChangeListener(viewResourceChangeListener);
+	}
 
 	/**
 	 * Add a new view model path to the list of available views in the preview.
 	 *
 	 * @param path The {@link IPath} to load
 	 */
-	public void addViewModel(IPath path) {
-		trackedPaths.put(path, loadView(path));
+	public void addViewModel(final IPath path) {
+		final VView view = loadView(path);
+		trackedPaths.put(path, view);
 	}
 
 	private VView loadView(IPath path) {
@@ -78,12 +115,7 @@ public class PreviewWorkspaceViewProvider implements IViewProvider {
 		view.eResource().unload();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.emf.ecp.view.spi.provider.IViewProvider#canProvideViewModel(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.ecp.view.spi.model.VViewModelProperties)
-	 */
+	@Override
 	public double canProvideViewModel(EObject eObject, VViewModelProperties properties) {
 		for (final VView view : trackedPaths.values()) {
 			if (view.getRootEClass().equals(eObject.eClass())) {
@@ -93,12 +125,7 @@ public class PreviewWorkspaceViewProvider implements IViewProvider {
 		return NOT_APPLICABLE;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.emf.ecp.view.spi.provider.IViewProvider#provideViewModel(org.eclipse.emf.ecore.EObject,
-	 *      org.eclipse.emf.ecp.view.spi.model.VViewModelProperties)
-	 */
+	@Override
 	public VView provideViewModel(EObject eObject, VViewModelProperties properties) {
 		for (final VView view : trackedPaths.values()) {
 			if (view.getRootEClass().equals(eObject.eClass())) {
@@ -108,4 +135,12 @@ public class PreviewWorkspaceViewProvider implements IViewProvider {
 		return null;
 	}
 
+	/** Clean the used resources. */
+	@Deactivate
+	public void dispose() {
+		if (viewResourceChangeListener != null) {
+			ResourcesPlugin.getWorkspace().removeResourceChangeListener(viewResourceChangeListener);
+		}
+	}
+
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF
index ce8788105b..780a0205a8 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Preview View
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.e3;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.model.internal.preview.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.internal.preview;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.preview;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.12.0,1.13.0)";resolution:=optional,
- org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)";resolution:=optional
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.13.0,1.14.0)";resolution:=optional,
+ org.eclipse.emfforms.editor;bundle-version="[1.13.0,1.14.0)";resolution:=optional
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.core.resources;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml
index 3ee082c6bf..18b5c7014a 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.preview.e3</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/Messages.java b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/Messages.java
index c5a20042ef..68109dd6f6 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/Messages.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/Messages.java
@@ -25,6 +25,7 @@ public class Messages extends NLS {
 	public static String ManageAdditionalViewsDialog_NoViewModelSelected;
 	public static String ManageAdditionalViewsDialog_RemoveView;
 	public static String ManageAdditionalViewsDialog_Title;
+	public static String OpenPreviewHandler_OpenPreview;
 	public static String PreviewView_AdditionalViews;
 	public static String PreviewView_AutomaticRefresh;
 	public static String PreviewView_ClearSampleDataButton;
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/actions/OpenPreviewHandler.java b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/actions/OpenPreviewHandler.java
index bfc26c6448..83485b7741 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/actions/OpenPreviewHandler.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/actions/OpenPreviewHandler.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecp.view.model.internal.preview.Activator;
+import org.eclipse.emf.ecp.view.model.internal.preview.Messages;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.reporting.StatusReport;
 import org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt.MasterDetailAction;
@@ -81,14 +82,14 @@ public class OpenPreviewHandler extends MasterDetailAction implements IToolbarAc
 
 	@Override
 	public Action getAction(final Object currentObject, ISelectionProvider selectionProvider) {
-		final Action previewAction = new Action("Open Preview") {
+		final Action previewAction = new Action(Messages.OpenPreviewHandler_OpenPreview) {
 			@Override
 			public void run() {
 				execute(((ResourceSet) currentObject).getResources().get(0).getAllContents().next());
 			}
 		};
 		previewAction.setImageDescriptor(ImageDescriptor.createFromURL(FrameworkUtil.getBundle(this.getClass())
-			.getResource("icons/preview.png")));
+			.getResource("icons/preview.png"))); //$NON-NLS-1$
 		return previewAction;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/messages.properties b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/messages.properties
index 419ab387de..740cdfa4b3 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/messages.properties
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/src/org/eclipse/emf/ecp/view/model/internal/preview/messages.properties
@@ -4,6 +4,7 @@ ManageAdditionalViewsDialog_NoFileSelected=The selected value must be a file.
 ManageAdditionalViewsDialog_NoViewModelSelected=The selected value must be a view model.
 ManageAdditionalViewsDialog_RemoveView=Remove View
 ManageAdditionalViewsDialog_Title=Manage additional Views
+OpenPreviewHandler_OpenPreview=Open Preview
 PreviewView_AdditionalViews=Manage additional Views
 PreviewView_AutomaticRefresh=Automatically refresh Preview View
 PreviewView_ClearSampleDataButton=Clear Sample Data
diff --git a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
index b0f993d31a..96e6b7423b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XMI View Model Provider
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.view.model.provider.xmi.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.model.provider.xmi;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.internal.view.model.provider.xmi;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml
index ec1ffd31bf..6e5f4560de 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emf.ecp.view.model/.project b/bundles/org.eclipse.emf.ecp.view.model/.project
index 9682b9230c..22ccc5d848 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/.project
+++ b/bundles/org.eclipse.emf.ecp.view.model/.project
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.emf.ecp.view.model</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.ecp.view.model</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.model/.settings/.api_filters
index 5cbfe10fe1..0d3ae325a3 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.model/.settings/.api_filters
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.emf.ecp.view.model" version="2">
     <resource path="META-INF/MANIFEST.MF">
+        <filter comment="SPI Changes for 1.13" id="923795461">
+            <message_arguments>
+                <message_argument value="1.13.0"/>
+                <message_argument value="1.12.0"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI change (1.3)" id="923795461">
             <message_arguments>
                 <message_argument value="1.3.0"/>
@@ -364,6 +370,13 @@
                 <message_argument value="1"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
+                <message_argument value="DATE_TIME_DISPLAY_TYPE"/>
+                <message_argument value="15"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
@@ -385,6 +398,13 @@
                 <message_argument value="14"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
+                <message_argument value="DOMAIN_MODEL_REFERENCE_CHANGE_LISTENER"/>
+                <message_argument value="16"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI change (1.3)" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
@@ -476,6 +496,13 @@
                 <message_argument value="13"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
+                <message_argument value="LABEL_ALIGNMENT"/>
+                <message_argument value="14"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage"/>
@@ -658,6 +685,18 @@
                 <message_argument value="ELEMENT__UUID"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage.Literals"/>
+                <message_argument value="HAS_TOOLTIP"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage.Literals"/>
+                <message_argument value="HAS_TOOLTIP__TOOLTIP"/>
+            </message_arguments>
+        </filter>
         <filter comment="spi 170" id="403767336">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.model.VViewPackage.Literals"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.core.prefs
index 26d14e4fb8..c94829777b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.core.prefs
@@ -1,418 +1,418 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.builder.invalidClasspath=abort

-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error

-org.eclipse.jdt.core.codeComplete.argumentPrefixes=

-org.eclipse.jdt.core.codeComplete.argumentSuffixes=

-org.eclipse.jdt.core.codeComplete.fieldPrefixes=

-org.eclipse.jdt.core.codeComplete.fieldSuffixes=

-org.eclipse.jdt.core.codeComplete.localPrefixes=

-org.eclipse.jdt.core.codeComplete.localSuffixes=

-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=

-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=

-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=

-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=

-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled

-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore

-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull

-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault

-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable

-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.6

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

-org.eclipse.jdt.core.compiler.problem.deadCode=warning

-org.eclipse.jdt.core.compiler.problem.deprecation=warning

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled

-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore

-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning

-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore

-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning

-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled

-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning

-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error

-org.eclipse.jdt.core.compiler.problem.nullReference=warning

-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error

-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning

-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore

-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning

-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore

-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning

-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=warning

-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.6

-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled

-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL

-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_after_package=1

-org.eclipse.jdt.core.formatter.blank_lines_before_field=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

-org.eclipse.jdt.core.formatter.blank_lines_before_method=1

-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

-org.eclipse.jdt.core.formatter.blank_lines_before_package=0

-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true

-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

-org.eclipse.jdt.core.formatter.comment.format_block_comments=true

-org.eclipse.jdt.core.formatter.comment.format_header=true

-org.eclipse.jdt.core.formatter.comment.format_html=true

-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

-org.eclipse.jdt.core.formatter.comment.format_line_comments=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert

-org.eclipse.jdt.core.formatter.comment.line_length=120

-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

-org.eclipse.jdt.core.formatter.compact_else_if=true

-org.eclipse.jdt.core.formatter.continuation_indentation=1

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1

-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_empty_lines=false

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

-org.eclipse.jdt.core.formatter.indentation.size=4

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

-org.eclipse.jdt.core.formatter.join_lines_in_comments=false

-org.eclipse.jdt.core.formatter.join_wrapped_lines=false

-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

-org.eclipse.jdt.core.formatter.lineSplit=120

-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-org.eclipse.jdt.core.formatter.tabulation.char=tab

-org.eclipse.jdt.core.formatter.tabulation.size=4

-org.eclipse.jdt.core.formatter.use_on_off_tags=true

-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-org.eclipse.jdt.core.incompleteClasspath=error

+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.ui.prefs
index 8553926909..8bc4bb4b36 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.ecp.view.model/.settings/org.eclipse.jdt.ui.prefs
@@ -1,127 +1,127 @@
-cleanup.add_default_serial_version_id=true

-cleanup.add_generated_serial_version_id=false

-cleanup.add_missing_annotations=true

-cleanup.add_missing_deprecated_annotations=true

-cleanup.add_missing_methods=false

-cleanup.add_missing_nls_tags=false

-cleanup.add_missing_override_annotations=true

-cleanup.add_missing_override_annotations_interface_methods=true

-cleanup.add_serial_version_id=false

-cleanup.always_use_blocks=true

-cleanup.always_use_parentheses_in_expressions=false

-cleanup.always_use_this_for_non_static_field_access=false

-cleanup.always_use_this_for_non_static_method_access=false

-cleanup.convert_functional_interfaces=false

-cleanup.convert_to_enhanced_for_loop=false

-cleanup.correct_indentation=false

-cleanup.format_source_code=true

-cleanup.format_source_code_changes_only=false

-cleanup.insert_inferred_type_arguments=false

-cleanup.make_local_variable_final=true

-cleanup.make_parameters_final=false

-cleanup.make_private_fields_final=true

-cleanup.make_type_abstract_if_missing_method=false

-cleanup.make_variable_declarations_final=true

-cleanup.never_use_blocks=false

-cleanup.never_use_parentheses_in_expressions=true

-cleanup.organize_imports=true

-cleanup.qualify_static_field_accesses_with_declaring_class=false

-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-cleanup.qualify_static_member_accesses_with_declaring_class=true

-cleanup.qualify_static_method_accesses_with_declaring_class=false

-cleanup.remove_private_constructors=true

-cleanup.remove_redundant_type_arguments=true

-cleanup.remove_trailing_whitespaces=true

-cleanup.remove_trailing_whitespaces_all=true

-cleanup.remove_trailing_whitespaces_ignore_empty=false

-cleanup.remove_unnecessary_casts=false

-cleanup.remove_unnecessary_nls_tags=false

-cleanup.remove_unused_imports=true

-cleanup.remove_unused_local_variables=false

-cleanup.remove_unused_private_fields=true

-cleanup.remove_unused_private_members=false

-cleanup.remove_unused_private_methods=true

-cleanup.remove_unused_private_types=true

-cleanup.sort_members=false

-cleanup.sort_members_all=false

-cleanup.use_anonymous_class_creation=false

-cleanup.use_blocks=true

-cleanup.use_blocks_only_for_return_and_throw=false

-cleanup.use_lambda=true

-cleanup.use_parentheses_in_expressions=true

-cleanup.use_this_for_non_static_field_access=true

-cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-cleanup.use_this_for_non_static_method_access=true

-cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-cleanup.use_type_arguments=false

-cleanup_profile=_esmCleanUp

-cleanup_settings_version=2

-eclipse.preferences.version=1

-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true

-formatter_profile=_esmFormatter

-formatter_settings_version=12

-org.eclipse.jdt.ui.exception.name=ex

-org.eclipse.jdt.ui.gettersetter.use.is=true

-org.eclipse.jdt.ui.javadoc=true

-org.eclipse.jdt.ui.keywordthis=false

-org.eclipse.jdt.ui.overrideannotation=true

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

-sp_cleanup.add_default_serial_version_id=true

-sp_cleanup.add_generated_serial_version_id=false

-sp_cleanup.add_missing_annotations=true

-sp_cleanup.add_missing_deprecated_annotations=true

-sp_cleanup.add_missing_methods=false

-sp_cleanup.add_missing_nls_tags=false

-sp_cleanup.add_missing_override_annotations=true

-sp_cleanup.add_missing_override_annotations_interface_methods=true

-sp_cleanup.add_serial_version_id=false

-sp_cleanup.always_use_blocks=true

-sp_cleanup.always_use_parentheses_in_expressions=false

-sp_cleanup.always_use_this_for_non_static_field_access=false

-sp_cleanup.always_use_this_for_non_static_method_access=false

-sp_cleanup.convert_functional_interfaces=false

-sp_cleanup.convert_to_enhanced_for_loop=false

-sp_cleanup.correct_indentation=false

-sp_cleanup.format_source_code=true

-sp_cleanup.format_source_code_changes_only=false

-sp_cleanup.insert_inferred_type_arguments=false

-sp_cleanup.make_local_variable_final=true

-sp_cleanup.make_parameters_final=false

-sp_cleanup.make_private_fields_final=true

-sp_cleanup.make_type_abstract_if_missing_method=false

-sp_cleanup.make_variable_declarations_final=true

-sp_cleanup.never_use_blocks=false

-sp_cleanup.never_use_parentheses_in_expressions=true

-sp_cleanup.on_save_use_additional_actions=true

-sp_cleanup.organize_imports=true

-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false

-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true

-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false

-sp_cleanup.remove_private_constructors=true

-sp_cleanup.remove_redundant_type_arguments=false

-sp_cleanup.remove_trailing_whitespaces=true

-sp_cleanup.remove_trailing_whitespaces_all=true

-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false

-sp_cleanup.remove_unnecessary_casts=false

-sp_cleanup.remove_unnecessary_nls_tags=true

-sp_cleanup.remove_unused_imports=true

-sp_cleanup.remove_unused_local_variables=false

-sp_cleanup.remove_unused_private_fields=true

-sp_cleanup.remove_unused_private_members=false

-sp_cleanup.remove_unused_private_methods=true

-sp_cleanup.remove_unused_private_types=true

-sp_cleanup.sort_members=false

-sp_cleanup.sort_members_all=false

-sp_cleanup.use_anonymous_class_creation=false

-sp_cleanup.use_blocks=true

-sp_cleanup.use_blocks_only_for_return_and_throw=false

-sp_cleanup.use_lambda=false

-sp_cleanup.use_parentheses_in_expressions=true

-sp_cleanup.use_this_for_non_static_field_access=true

-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true

-sp_cleanup.use_this_for_non_static_method_access=true

-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

-sp_cleanup.use_type_arguments=false

+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
index 0f55538761..c887b83095 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.model.impl.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.model.internal.reporting;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.model.reporting;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.model.internal.reporting;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.model.reporting;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore b/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore
index dcb56dff23..39bbcda3fd 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore
@@ -92,4 +92,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="DateTimeDisplayAttachment" eSuperTypes="#//Attachment">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayType" eType="#//DateTimeDisplayType"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="HasTooltip" abstract="true" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/model/view.genmodel b/bundles/org.eclipse.emf.ecp.view.model/model/view.genmodel
index e85e3f0c04..c888433a56 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/model/view.genmodel
+++ b/bundles/org.eclipse.emf.ecp.view.model/model/view.genmodel
@@ -8,8 +8,7 @@
     nonNLSMarkers="true" codeFormatting="true" commentFormatting="true" testSuiteClass="org.eclipse.emf.ecp.view.model.tests.ViewAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
     editPluginID="org.eclipse.emf.ecp.view.model.edit" editorPluginID="org.eclipse.emf.ecp.view.model.editor"
-    language="" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
-    interfaceNamePattern="V{0}" classNamePattern="V{0}Impl" importOrganizing="true">
+    language="" interfaceNamePattern="V{0}" classNamePattern="V{0}Impl" importOrganizing="true">
   <foreignModel>view.ecore</foreignModel>
   <genPackages prefix="View" basePackage="org.eclipse.emf.ecp.view.spi" resource="XMI"
       disposableProviderFactory="true" extensibleProviderFactory="true" childCreationExtenders="true"
@@ -46,6 +45,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute view.ecore#//Element/readonly"/>
       <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference view.ecore#//Element/diagnostic"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference view.ecore#//Element/attachments"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute view.ecore#//Element/uuid"/>
     </genClasses>
     <genClasses ecoreClass="view.ecore#//View">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference view.ecore#//View/rootEClass"/>
@@ -74,5 +74,9 @@
     <genClasses ecoreClass="view.ecore#//DateTimeDisplayAttachment">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute view.ecore#//DateTimeDisplayAttachment/displayType"/>
     </genClasses>
+    <genClasses image="false" ecoreClass="view.ecore#//HasTooltip">
+      <genFeatures createChild="false" propertyDescription="" propertyMultiLine="true"
+          ecoreFeature="ecore:EAttribute view.ecore#//HasTooltip/tooltip"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore b/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
index 671daa930a..013c808dd4 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
@@ -1,122 +1,122 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="viewModel" nsPrefix="">

-  <eClassifiers xsi:type="ecore:EClass" name="VView">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

-        eType="#//VElement" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VAbstractElement" abstract="true">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="attachments" upperBound="-1"

-        eType="#//VAttachment" containment="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

-        transient="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

-        unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

-        unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

-        unsettable="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

-        unsettable="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VAttachment" abstract="true" interface="true"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VElement" abstract="true" eSuperTypes="#//VAbstractElement"/>

-  <eClassifiers xsi:type="ecore:EClass" name="VContainer" eSuperTypes="#//VElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

-        eType="#//VElement" containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VControl" eSuperTypes="#//VElement">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" eType="#//DomainModelReference"

-        containment="true"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="DomainModelReference">

-    <eOperations name="resolve"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"

-        transient="true"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="VFeaturePathDomainModelReference" eSuperTypes="#//DomainModelReference">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"

-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEReferencePath"

-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>

-  </eClassifiers>

-  <eSubpackages name="separator">

-    <eClassifiers xsi:type="ecore:EClass" name="VSeparator" eSuperTypes="#//VElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="group">

-    <eClassifiers xsi:type="ecore:EClass" name="VGroup" eSuperTypes="#//VContainer">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="rule">

-    <eClassifiers xsi:type="ecore:EClass" name="VRule" eSuperTypes="#//VAttachment">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//rule/VCondition"

-          containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//rule/VRuleType"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EEnum" name="VRuleType">

-      <eLiterals name="ENABLE_ON_RULE_TRIGGER" literal=""/>

-      <eLiterals name="DISABLE_ON_RULE_TRIGGER" value="1" literal=""/>

-      <eLiterals name="SHOW_ON_RULE_TRIGGER" value="2" literal=""/>

-      <eLiterals name="HIDE_ON_RULE_TRIGGER" value="3" literal=""/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VCondition" abstract="true"/>

-    <eClassifiers xsi:type="ecore:EClass" name="VCompositeCondition" abstract="true"

-        eSuperTypes="#//rule/VCondition">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="subConditions" upperBound="-1"

-          eType="#//rule/VCondition" containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VOrCondition" abstract="true" eSuperTypes="#//rule/VCompositeCondition"/>

-    <eClassifiers xsi:type="ecore:EClass" name="VAndCondition" abstract="true" eSuperTypes="#//rule/VCompositeCondition"/>

-    <eClassifiers xsi:type="ecore:EClass" name="VDomainModelAttributeCondition" eSuperTypes="#//rule/VCondition">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference"

-          eType="#//DomainModelReference" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="treeMasterDetailView">

-    <eClassifiers xsi:type="ecore:EClass" name="VTreeMasterDetailView" eSuperTypes="#//VElement">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="rootTreeEntries" upperBound="-1"

-          eType="#//treeMasterDetailView/VTreeEntry" containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VTreeEntry" eSuperTypes="#//VAbstractElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="detailViewModelElement"

-          eType="#//VElement" containment="true"/>

-      <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"

-          eType="#//treeMasterDetailView/VTreeEntry" containment="true"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="customControl">

-    <eClassifiers xsi:type="ecore:EClass" name="VCustomControl" eSuperTypes="#//VElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="customComposite">

-    <eClassifiers xsi:type="ecore:EClass" name="VCustomViewModelElement" eSuperTypes="#//VElement">

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    </eClassifiers>

-  </eSubpackages>

-  <eSubpackages name="columnComposite">

-    <eClassifiers xsi:type="ecore:EClass" name="VColumnCompoite">

-      <eStructuralFeatures xsi:type="ecore:EReference" name="columns" upperBound="-1"

-          eType="#//columnComposite/VColumn" containment="true"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="VColumn" eSuperTypes="#//VContainer"/>

-  </eSubpackages>

-  <eSubpackages name="horizontalLayout">

-    <eClassifiers xsi:type="ecore:EClass" name="VHorizontalLayout" eSuperTypes="#//VContainer"/>

-  </eSubpackages>

-  <eSubpackages name="verticalLayout">

-    <eClassifiers xsi:type="ecore:EClass" name="VVerticalLayout" eSuperTypes="#//VContainer"/>

-  </eSubpackages>

-</ecore:EPackage>

+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="viewModel" nsPrefix="">
+  <eClassifiers xsi:type="ecore:EClass" name="VView">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+        eType="#//VElement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VAbstractElement" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="attachments" upperBound="-1"
+        eType="#//VAttachment" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        unsettable="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        unsettable="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VAttachment" abstract="true" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="VElement" abstract="true" eSuperTypes="#//VAbstractElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="VContainer" eSuperTypes="#//VElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+        eType="#//VElement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VControl" eSuperTypes="#//VElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" eType="#//DomainModelReference"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DomainModelReference">
+    <eOperations name="resolve"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
+        transient="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VFeaturePathDomainModelReference" eSuperTypes="#//DomainModelReference">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"
+        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEReferencePath"
+        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
+  </eClassifiers>
+  <eSubpackages name="separator">
+    <eClassifiers xsi:type="ecore:EClass" name="VSeparator" eSuperTypes="#//VElement">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="group">
+    <eClassifiers xsi:type="ecore:EClass" name="VGroup" eSuperTypes="#//VContainer">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="rule">
+    <eClassifiers xsi:type="ecore:EClass" name="VRule" eSuperTypes="#//VAttachment">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//rule/VCondition"
+          containment="true"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//rule/VRuleType"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EEnum" name="VRuleType">
+      <eLiterals name="ENABLE_ON_RULE_TRIGGER" literal=""/>
+      <eLiterals name="DISABLE_ON_RULE_TRIGGER" value="1" literal=""/>
+      <eLiterals name="SHOW_ON_RULE_TRIGGER" value="2" literal=""/>
+      <eLiterals name="HIDE_ON_RULE_TRIGGER" value="3" literal=""/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="VCondition" abstract="true"/>
+    <eClassifiers xsi:type="ecore:EClass" name="VCompositeCondition" abstract="true"
+        eSuperTypes="#//rule/VCondition">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="subConditions" upperBound="-1"
+          eType="#//rule/VCondition" containment="true"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="VOrCondition" abstract="true" eSuperTypes="#//rule/VCompositeCondition"/>
+    <eClassifiers xsi:type="ecore:EClass" name="VAndCondition" abstract="true" eSuperTypes="#//rule/VCompositeCondition"/>
+    <eClassifiers xsi:type="ecore:EClass" name="VDomainModelAttributeCondition" eSuperTypes="#//rule/VCondition">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference"
+          eType="#//DomainModelReference" containment="true"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="treeMasterDetailView">
+    <eClassifiers xsi:type="ecore:EClass" name="VTreeMasterDetailView" eSuperTypes="#//VElement">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="rootTreeEntries" upperBound="-1"
+          eType="#//treeMasterDetailView/VTreeEntry" containment="true"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="VTreeEntry" eSuperTypes="#//VAbstractElement">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="detailViewModelElement"
+          eType="#//VElement" containment="true"/>
+      <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
+          eType="#//treeMasterDetailView/VTreeEntry" containment="true"/>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="customControl">
+    <eClassifiers xsi:type="ecore:EClass" name="VCustomControl" eSuperTypes="#//VElement">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="customComposite">
+    <eClassifiers xsi:type="ecore:EClass" name="VCustomViewModelElement" eSuperTypes="#//VElement">
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="columnComposite">
+    <eClassifiers xsi:type="ecore:EClass" name="VColumnCompoite">
+      <eStructuralFeatures xsi:type="ecore:EReference" name="columns" upperBound="-1"
+          eType="#//columnComposite/VColumn" containment="true"/>
+    </eClassifiers>
+    <eClassifiers xsi:type="ecore:EClass" name="VColumn" eSuperTypes="#//VContainer"/>
+  </eSubpackages>
+  <eSubpackages name="horizontalLayout">
+    <eClassifiers xsi:type="ecore:EClass" name="VHorizontalLayout" eSuperTypes="#//VContainer"/>
+  </eSubpackages>
+  <eSubpackages name="verticalLayout">
+    <eClassifiers xsi:type="ecore:EClass" name="VVerticalLayout" eSuperTypes="#//VContainer"/>
+  </eSubpackages>
+</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/plugin.properties b/bundles/org.eclipse.emf.ecp.view.model/plugin.properties
index 47f15e7e68..71d5459316 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/plugin.properties
+++ b/bundles/org.eclipse.emf.ecp.view.model/plugin.properties
@@ -1,67 +1,67 @@
-#

+#
+
+pluginName = View Model
+providerName = Eclipse Modeling Project
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
_UI_PropertyDescriptor_description = The {0} of the {1}
+
_UI_View_type = View
+_UI_AbstractCategorization_type = Abstract Categorization
+_UI_Rule_type = Rule
+_UI_ShowRule_type = Show Rule
+_UI_EnableRule_type = Enable Rule
+_UI_Condition_type = Condition
+_UI_LeafCondition_type = Leaf Condition
+_UI_OrCondition_type = Or Condition
+_UI_AndCondition_type = And Condition
+_UI_Categorization_type = Categorization
+_UI_Category_type = Category
+_UI_Composite_type = Composite
+_UI_Control_type = Control
+_UI_TableControl_type = Table Control
+_UI_TableColumn_type = Table Column
+_UI_CustomComposite_type = Custom Composite
+_UI_Seperator_type = Seperator
+_UI_CompositeCollection_type = Composite Collection
+_UI_ColumnComposite_type = Column Composite
+_UI_Column_type = Column
+_UI_Group_type = Group
+_UI_TreeCategory_type = Tree Category
+_UI_Unknown_type = Object
+
_UI_Unknown_datatype= Value
+
_UI_View_rootEClass_feature = Root EClass
+_UI_AbstractCategorization_name_feature = Name
+_UI_AbstractCategorization_rule_feature = Rule
+_UI_Rule_condition_feature = Condition
+_UI_ShowRule_hide_feature = Hide
+_UI_EnableRule_disable_feature = Disable
+_UI_LeafCondition_attribute_feature = Attribute
+_UI_LeafCondition_expectedValue_feature = Expected Value
+_UI_LeafCondition_pathToAttribute_feature = Path To Attribute
+_UI_OrCondition_conditions_feature = Conditions
+_UI_AndCondition_conditions_feature = Conditions
+_UI_Categorization_categorizations_feature = Categorizations
+_UI_Category_composite_feature = Composite
+_UI_Composite_name_feature = Name
+_UI_Composite_rule_feature = Rule
+_UI_Control_targetFeature_feature = Target Feature
+_UI_Control_hint_feature = Hint
+_UI_Control_readonly_feature = Readonly
+_UI_Control_mandatory_feature = Mandatory
+_UI_Control_pathToFeature_feature = Path To Feature
+_UI_TableControl_columns_feature = Columns
+_UI_TableControl_addRemoveDisabled_feature = Add Remove Disabled
+_UI_TableColumn_attribute_feature = Attribute
+_UI_TableColumn_readOnly_feature = Read Only
+_UI_CustomComposite_bundle_feature = Bundle
+_UI_CustomComposite_className_feature = Class Name
+_UI_CompositeCollection_composites_feature = Composites
+_UI_TreeCategory_childComposite_feature = Child Composite
+_UI_TreeCategory_targetFeature_feature = Target Feature
+_UI_TreeCategory_pathToFeature_feature = Path To Feature
+_UI_Unknown_feature = Unspecified
 

-pluginName = View Model

-providerName = Eclipse Modeling Project

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-
_UI_PropertyDescriptor_description = The {0} of the {1}

-
_UI_View_type = View

-_UI_AbstractCategorization_type = Abstract Categorization

-_UI_Rule_type = Rule

-_UI_ShowRule_type = Show Rule

-_UI_EnableRule_type = Enable Rule

-_UI_Condition_type = Condition

-_UI_LeafCondition_type = Leaf Condition

-_UI_OrCondition_type = Or Condition

-_UI_AndCondition_type = And Condition

-_UI_Categorization_type = Categorization

-_UI_Category_type = Category

-_UI_Composite_type = Composite

-_UI_Control_type = Control

-_UI_TableControl_type = Table Control

-_UI_TableColumn_type = Table Column

-_UI_CustomComposite_type = Custom Composite

-_UI_Seperator_type = Seperator

-_UI_CompositeCollection_type = Composite Collection

-_UI_ColumnComposite_type = Column Composite

-_UI_Column_type = Column

-_UI_Group_type = Group

-_UI_TreeCategory_type = Tree Category

-_UI_Unknown_type = Object

-
_UI_Unknown_datatype= Value

-
_UI_View_rootEClass_feature = Root EClass

-_UI_AbstractCategorization_name_feature = Name

-_UI_AbstractCategorization_rule_feature = Rule

-_UI_Rule_condition_feature = Condition

-_UI_ShowRule_hide_feature = Hide

-_UI_EnableRule_disable_feature = Disable

-_UI_LeafCondition_attribute_feature = Attribute

-_UI_LeafCondition_expectedValue_feature = Expected Value

-_UI_LeafCondition_pathToAttribute_feature = Path To Attribute

-_UI_OrCondition_conditions_feature = Conditions

-_UI_AndCondition_conditions_feature = Conditions

-_UI_Categorization_categorizations_feature = Categorizations

-_UI_Category_composite_feature = Composite

-_UI_Composite_name_feature = Name

-_UI_Composite_rule_feature = Rule

-_UI_Control_targetFeature_feature = Target Feature

-_UI_Control_hint_feature = Hint

-_UI_Control_readonly_feature = Readonly

-_UI_Control_mandatory_feature = Mandatory

-_UI_Control_pathToFeature_feature = Path To Feature

-_UI_TableControl_columns_feature = Columns

-_UI_TableControl_addRemoveDisabled_feature = Add Remove Disabled

-_UI_TableColumn_attribute_feature = Attribute

-_UI_TableColumn_readOnly_feature = Read Only

-_UI_CustomComposite_bundle_feature = Bundle

-_UI_CustomComposite_className_feature = Class Name

-_UI_CompositeCollection_composites_feature = Composites

-_UI_TreeCategory_childComposite_feature = Child Composite

-_UI_TreeCategory_targetFeature_feature = Target Feature

-_UI_TreeCategory_pathToFeature_feature = Path To Feature

-_UI_Unknown_feature = Unspecified

-


diff --git a/bundles/org.eclipse.emf.ecp.view.model/plugin.xml b/bundles/org.eclipse.emf.ecp.view.model/plugin.xml
index 0f73f2120b..67aa4e2f19 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model/plugin.xml
@@ -1,31 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-

-<!--

--->

-

-<plugin>

-

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated view -->

-      <package

-            uri="http://org/eclipse/emf/ecp/view/model/170"

-            class="org.eclipse.emf.ecp.view.spi.model.VViewPackage"

-            genModel="model/view.genmodel"/>

-   </extension>

-

-   <extension point="org.eclipse.emf.ecore.extension_parser">

-      <!-- @generated view -->

-      <parser

-            type="view"

-            class="org.eclipse.emf.ecp.view.spi.model.util.VViewResourceFactoryImpl"/>

-   </extension>

-   <extension

-         point="org.eclipse.emf.edapt.migrators">

-      <migrator

-            path="model/view.history">

-      </migrator>

-   </extension>

-

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+   <extension
+         name=""
+         point="org.eclipse.emf.ecore.generated_package">
+      <package
+            genModel="model/view.genmodel"
+            uri="http://org/eclipse/emf/ecp/view/model/170"
+            class="org.eclipse.emf.ecp.view.spi.model.VViewPackage">
+      </package>
+   </extension>
+   <extension
+         name=""
+         point="org.eclipse.emf.ecore.extension_parser">
+      <parser
+            type="view"
+            class="org.eclipse.emf.ecp.view.spi.model.util.VViewResourceFactoryImpl">
+      </parser>
+   </extension>
+   <extension
+         name=""
+         point="org.eclipse.emf.edapt.migrators">
+      <migrator
+            path="model/view.history">
+      </migrator>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
index 8624240923..2b0dbc77bc 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://maven.apache.org/POM/4.0.0"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

-  <modelVersion>4.0.0</modelVersion>

-

-  <parent>

-    <groupId>org.eclipse.emf.ecp</groupId>

-    <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

-    <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

-  </parent>

-

-  <artifactId>org.eclipse.emf.ecp.view.model</artifactId>

-<packaging>eclipse-plugin</packaging>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.emf.ecp</groupId>
+    <artifactId>ecp-bundles-parent</artifactId>
+    <version>1.13.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+  </parent>
+
+  <artifactId>org.eclipse.emf.ecp.view.model</artifactId>
+<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/model/internal/reporting/LogConsumer.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/model/internal/reporting/LogConsumer.java
index b1dca7c43e..86690d2497 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/model/internal/reporting/LogConsumer.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/model/internal/reporting/LogConsumer.java
@@ -1,40 +1,40 @@
-/*******************************************************************************

- * Copyright (c) 2014 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Edgar Mueller - initial API and implementation

- ******************************************************************************/

-package org.eclipse.emf.ecp.view.model.internal.reporting;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.emf.ecp.view.spi.model.impl.Activator;

-import org.eclipse.emf.ecp.view.spi.model.util.ViewModelUtil;

-import org.eclipse.emfforms.spi.common.report.AbstractReport;

-import org.eclipse.emfforms.spi.common.report.ReportServiceConsumer;

-

-/**

- * A {@link ReportServiceConsumer} that logs all all received {@code ReportEntities}.

- *

- * @author emueller

- */

-public class LogConsumer implements ReportServiceConsumer {

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emfforms.spi.common.report.ReportServiceConsumer#reported(org.eclipse.emfforms.spi.common.report.AbstractReport)

-	 */

-	@Override

-	public void reported(AbstractReport reportEntity) {

-		if (reportEntity.getSeverity() > IStatus.INFO || ViewModelUtil.isDebugMode()) {

-			Activator.log(reportEntity);

-		}

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.model.internal.reporting;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.ecp.view.spi.model.impl.Activator;
+import org.eclipse.emf.ecp.view.spi.model.util.ViewModelUtil;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportServiceConsumer;
+
+/**
+ * A {@link ReportServiceConsumer} that logs all all received {@code ReportEntities}.
+ *
+ * @author emueller
+ */
+public class LogConsumer implements ReportServiceConsumer {
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.common.report.ReportServiceConsumer#reported(org.eclipse.emfforms.spi.common.report.AbstractReport)
+	 */
+	@Override
+	public void reported(AbstractReport reportEntity) {
+		if (reportEntity.getSeverity() > IStatus.INFO || ViewModelUtil.isDebugMode()) {
+			Activator.log(reportEntity);
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DateTimeDisplayType.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DateTimeDisplayType.java
index 37df732d22..8f5303e385 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DateTimeDisplayType.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/DateTimeDisplayType.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.common.util.Enumerator;
  * 
  * @since 1.8
  *        <!-- end-user-doc -->
- *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getDateTimeDisplayType()
  * @model
  * @generated
@@ -34,7 +33,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * The '<em><b>Time And Date</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #TIME_AND_DATE_VALUE
 	 * @generated
 	 * @ordered
@@ -45,7 +44,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * The '<em><b>Time Only</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #TIME_ONLY_VALUE
 	 * @generated
 	 * @ordered
@@ -56,7 +55,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * The '<em><b>Date Only</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #DATE_ONLY_VALUE
 	 * @generated
 	 * @ordered
@@ -71,7 +70,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #TIME_AND_DATE
 	 * @model name="TimeAndDate"
 	 * @generated
@@ -87,7 +86,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #TIME_ONLY
 	 * @model name="TimeOnly"
 	 * @generated
@@ -103,7 +102,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #DATE_ONLY
 	 * @model name="DateOnly"
 	 * @generated
@@ -115,7 +114,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * An array of all the '<em><b>Date Time Display Type</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static final DateTimeDisplayType[] VALUES_ARRAY = new DateTimeDisplayType[] {
@@ -128,7 +127,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * A public read-only list of all the '<em><b>Date Time Display Type</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<DateTimeDisplayType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -137,14 +136,14 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * Returns the '<em><b>Date Time Display Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param literal the literal.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static DateTimeDisplayType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final DateTimeDisplayType result = VALUES_ARRAY[i];
+			DateTimeDisplayType result = VALUES_ARRAY[i];
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -156,14 +155,14 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * Returns the '<em><b>Date Time Display Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param name the name.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static DateTimeDisplayType getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final DateTimeDisplayType result = VALUES_ARRAY[i];
+			DateTimeDisplayType result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -175,7 +174,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * Returns the '<em><b>Date Time Display Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the integer value.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
@@ -195,7 +194,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -203,7 +202,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -211,7 +210,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -220,7 +219,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private DateTimeDisplayType(int value, String name, String literal) {
@@ -232,7 +231,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -243,7 +242,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,7 +253,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +265,7 @@ public enum DateTimeDisplayType implements Enumerator {
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/LabelAlignment.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/LabelAlignment.java
index e77fef1a5d..eb401ec3eb 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/LabelAlignment.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/LabelAlignment.java
@@ -45,7 +45,7 @@ public enum LabelAlignment implements Enumerator {
 	 * The '<em><b>Left</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #LEFT_VALUE
 	 * @generated
 	 * @ordered
@@ -68,7 +68,7 @@ public enum LabelAlignment implements Enumerator {
 	 * The '<em><b>None</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #NONE_VALUE
 	 * @generated
 	 * @ordered
@@ -100,7 +100,7 @@ public enum LabelAlignment implements Enumerator {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #LEFT
 	 * @model name="Left"
 	 * @generated
@@ -133,7 +133,7 @@ public enum LabelAlignment implements Enumerator {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #NONE
 	 * @model name="None"
 	 * @generated
@@ -145,7 +145,7 @@ public enum LabelAlignment implements Enumerator {
 	 * An array of all the '<em><b>Label Alignment</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static final LabelAlignment[] VALUES_ARRAY = new LabelAlignment[] {
@@ -159,7 +159,7 @@ public enum LabelAlignment implements Enumerator {
 	 * A public read-only list of all the '<em><b>Label Alignment</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<LabelAlignment> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -168,14 +168,14 @@ public enum LabelAlignment implements Enumerator {
 	 * Returns the '<em><b>Label Alignment</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param literal the literal.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static LabelAlignment get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final LabelAlignment result = VALUES_ARRAY[i];
+			LabelAlignment result = VALUES_ARRAY[i];
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -187,14 +187,14 @@ public enum LabelAlignment implements Enumerator {
 	 * Returns the '<em><b>Label Alignment</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param name the name.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static LabelAlignment getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final LabelAlignment result = VALUES_ARRAY[i];
+			LabelAlignment result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -206,7 +206,7 @@ public enum LabelAlignment implements Enumerator {
 	 * Returns the '<em><b>Label Alignment</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the integer value.
 	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
@@ -228,7 +228,7 @@ public enum LabelAlignment implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -236,7 +236,7 @@ public enum LabelAlignment implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -244,7 +244,7 @@ public enum LabelAlignment implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -253,7 +253,7 @@ public enum LabelAlignment implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private LabelAlignment(int value, String name, String literal) {
@@ -265,7 +265,7 @@ public enum LabelAlignment implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -276,7 +276,7 @@ public enum LabelAlignment implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -287,7 +287,7 @@ public enum LabelAlignment implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -299,7 +299,7 @@ public enum LabelAlignment implements Enumerator {
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VAttachment.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VAttachment.java
index e425925b70..698196c39d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VAttachment.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VAttachment.java
@@ -16,8 +16,9 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Attachment</b></em>'.
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
+ *        <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getAttachment()
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedContainer.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedContainer.java
index d18da60c02..3add75ba28 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedContainer.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedContainer.java
@@ -14,8 +14,9 @@ package org.eclipse.emf.ecp.view.spi.model;
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Composite Collection</b></em>'.
+ * 
  * @since 1.4
- * <!-- end-user-doc -->
+ *        <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getContainedContainer()
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedElement.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedElement.java
index 42eadec5d7..b28d2cfa33 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedElement.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainedElement.java
@@ -14,8 +14,9 @@ package org.eclipse.emf.ecp.view.spi.model;
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Composite</b></em>'.
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
+ *        <!-- end-user-doc -->
  *
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getContainedElement()
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainer.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainer.java
index 65f500276d..55e8f4ff24 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainer.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VContainer.java
@@ -16,15 +16,16 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Container</b></em>'.
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
+ *        <!-- end-user-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.VContainer#getChildren <em>Children</em>}</li>
- * </ul>
+ *        <p>
+ *        The following features are supported:
+ *        </p>
+ *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VContainer#getChildren <em>Children</em>}</li>
+ *        </ul>
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getContainer()
  * @model abstract="true"
@@ -40,7 +41,7 @@ public interface VContainer extends VElement {
 	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Children</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getContainer_Children()
 	 * @model containment="true"
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java
index 8d176bfc85..fd5cc08a6d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java
@@ -28,8 +28,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
  *        </p>
  *        <ul>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VControl#getLabelAlignment <em>Label Alignment</em>}</li>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VControl#getDomainModelReference <em>Domain Model Reference</em>
- *        }</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VControl#getDomainModelReference <em>Domain Model
+ *        Reference</em>}</li>
  *        </ul>
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getControl()
@@ -45,7 +45,7 @@ public interface VControl extends VContainedElement {
 	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Domain Model Reference</em>' containment reference.
 	 * @see #setDomainModelReference(VDomainModelReference)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getControl_DomainModelReference()
@@ -55,11 +55,11 @@ public interface VControl extends VContainedElement {
 	VDomainModelReference getDomainModelReference();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VControl#getDomainModelReference
-	 * <em>Domain Model Reference</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VControl#getDomainModelReference <em>Domain
+	 * Model Reference</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Domain Model Reference</em>' containment reference.
 	 * @see #getDomainModelReference()
 	 * @generated
@@ -76,7 +76,7 @@ public interface VControl extends VContainedElement {
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Label Alignment</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.model.LabelAlignment
 	 * @see #setLabelAlignment(LabelAlignment)
@@ -87,11 +87,11 @@ public interface VControl extends VContainedElement {
 	LabelAlignment getLabelAlignment();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VControl#getLabelAlignment
-	 * <em>Label Alignment</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VControl#getLabelAlignment <em>Label
+	 * Alignment</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Label Alignment</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.model.LabelAlignment
 	 * @see #getLabelAlignment()
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDateTimeDisplayAttachment.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDateTimeDisplayAttachment.java
index 5bba901acf..2ec6124038 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDateTimeDisplayAttachment.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDateTimeDisplayAttachment.java
@@ -22,8 +22,8 @@ package org.eclipse.emf.ecp.view.spi.model;
  *        The following features are supported:
  *        </p>
  *        <ul>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment#getDisplayType <em>Display Type</em>}
- *        </li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment#getDisplayType <em>Display
+ *        Type</em>}</li>
  *        </ul>
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getDateTimeDisplayAttachment()
@@ -40,7 +40,7 @@ public interface VDateTimeDisplayAttachment extends VAttachment {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Display Type</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType
 	 * @see #setDisplayType(DateTimeDisplayType)
@@ -55,7 +55,7 @@ public interface VDateTimeDisplayAttachment extends VAttachment {
 	 * <em>Display Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Display Type</em>' attribute.
 	 * @see org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType
 	 * @see #getDisplayType()
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDiagnostic.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDiagnostic.java
index 4b42f8bf85..cb2d59c192 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDiagnostic.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDiagnostic.java
@@ -21,16 +21,17 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VDiagnostic</b></em>'.
+ * 
  * @since 1.2
  * @noimplement This interface is not intended to be implemented by clients.
- * <!-- end-user-doc -->
+ *              <!-- end-user-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.VDiagnostic#getDiagnostics <em>Diagnostics</em>}</li>
- * </ul>
+ *              <p>
+ *              The following features are supported:
+ *              </p>
+ *              <ul>
+ *              <li>{@link org.eclipse.emf.ecp.view.spi.model.VDiagnostic#getDiagnostics <em>Diagnostics</em>}</li>
+ *              </ul>
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getDiagnostic()
  * @model
@@ -46,7 +47,7 @@ public interface VDiagnostic extends EObject {
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Diagnostics</em>' attribute list.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getDiagnostic_Diagnostics()
 	 * @model transient="true"
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java
index a60463e354..afb96f2805 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VDomainModelReference.java
@@ -29,8 +29,8 @@ import org.eclipse.emf.ecore.EStructuralFeature.Setting;
  *             The following features are supported:
  *             </p>
  *             <ul>
- *             <li>{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#getChangeListener
- *             <em>Change Listener</em>}</li>
+ *             <li>{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#getChangeListener <em>Change
+ *             Listener</em>}</li>
  *             </ul>
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getDomainModelReference()
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VElement.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VElement.java
index b469b64969..7482e7f30a 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VElement.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VElement.java
@@ -49,7 +49,7 @@ public interface VElement extends EObject {
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getElement_Name()
@@ -62,7 +62,7 @@ public interface VElement extends EObject {
 	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VElement#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
@@ -108,7 +108,7 @@ public interface VElement extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Visible</em>' attribute.
 	 * @see #setVisible(boolean)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getElement_Visible()
@@ -121,7 +121,7 @@ public interface VElement extends EObject {
 	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VElement#isVisible <em>Visible</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Visible</em>' attribute.
 	 * @see #isVisible()
 	 * @generated
@@ -137,7 +137,7 @@ public interface VElement extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Enabled</em>' attribute.
 	 * @see #setEnabled(boolean)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getElement_Enabled()
@@ -150,7 +150,7 @@ public interface VElement extends EObject {
 	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VElement#isEnabled <em>Enabled</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Enabled</em>' attribute.
 	 * @see #isEnabled()
 	 * @generated
@@ -166,7 +166,7 @@ public interface VElement extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Readonly</em>' attribute.
 	 * @see #setReadonly(boolean)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getElement_Readonly()
@@ -180,7 +180,7 @@ public interface VElement extends EObject {
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Readonly</em>' attribute.
 	 * @see #isReadonly()
 	 * @generated
@@ -195,7 +195,7 @@ public interface VElement extends EObject {
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Diagnostic</em>' containment reference.
 	 * @see #setDiagnostic(VDiagnostic)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getElement_Diagnostic()
@@ -209,7 +209,7 @@ public interface VElement extends EObject {
 	 * containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Diagnostic</em>' containment reference.
 	 * @see #getDiagnostic()
 	 * @generated
@@ -225,7 +225,7 @@ public interface VElement extends EObject {
 	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Attachments</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getElement_Attachments()
 	 * @model containment="true"
@@ -243,7 +243,6 @@ public interface VElement extends EObject {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Uuid</em>' attribute.
 	 * @see #setUuid(String)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getElement_Uuid()
@@ -258,7 +257,6 @@ public interface VElement extends EObject {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @param value the new value of the '<em>Uuid</em>' attribute.
 	 * @see #getUuid()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VFeaturePathDomainModelReference.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VFeaturePathDomainModelReference.java
index 508220d53f..26335337c2 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VFeaturePathDomainModelReference.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VFeaturePathDomainModelReference.java
@@ -18,18 +18,19 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>VFeature Path Domain Model Reference</b></em>'.
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
+ *        <!-- end-user-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEFeature
- * <em>Domain Model EFeature</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEReferencePath
- * <em>Domain Model EReference Path</em>}</li>
- * </ul>
+ *        <p>
+ *        The following features are supported:
+ *        </p>
+ *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEFeature
+ *        <em>Domain Model EFeature</em>}</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEReferencePath
+ *        <em>Domain Model EReference Path</em>}</li>
+ *        </ul>
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getFeaturePathDomainModelReference()
  * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='resolveable'"
@@ -45,7 +46,7 @@ public interface VFeaturePathDomainModelReference extends VDomainModelReference
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Domain Model EFeature</em>' reference.
 	 * @see #setDomainModelEFeature(EStructuralFeature)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getFeaturePathDomainModelReference_DomainModelEFeature()
@@ -55,12 +56,12 @@ public interface VFeaturePathDomainModelReference extends VDomainModelReference
 	EStructuralFeature getDomainModelEFeature();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEFeature
-	 * <em>Domain Model EFeature</em>}' reference.
+	 * Sets the value of the
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEFeature <em>Domain
+	 * Model EFeature</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Domain Model EFeature</em>' reference.
 	 * @see #getDomainModelEFeature()
 	 * @generated
@@ -76,7 +77,7 @@ public interface VFeaturePathDomainModelReference extends VDomainModelReference
 	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Domain Model EReference Path</em>' reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getFeaturePathDomainModelReference_DomainModelEReferencePath()
 	 * @model
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VHasTooltip.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VHasTooltip.java
new file mode 100644
index 0000000000..529e861b0d
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VHasTooltip.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.model;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Has Tooltip</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip#getTooltip <em>Tooltip</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getHasTooltip()
+ * @model interface="true" abstract="true"
+ * @generated
+ * @since 1.13
+ */
+public interface VHasTooltip extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Tooltip</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Tooltip</em>' attribute.
+	 * @see #setTooltip(String)
+	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getHasTooltip_Tooltip()
+	 * @model
+	 * @generated
+	 */
+	String getTooltip();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip#getTooltip <em>Tooltip</em>}'
+	 * attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value the new value of the '<em>Tooltip</em>' attribute.
+	 * @see #getTooltip()
+	 * @generated
+	 */
+	void setTooltip(String value);
+
+} // VHasTooltip
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VView.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VView.java
index 2c2c2d48b6..e25dad960f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VView.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VView.java
@@ -45,7 +45,7 @@ public interface VView extends VElement {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Root EClass</em>' reference.
 	 * @see #setRootEClass(EClass)
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getView_RootEClass()
@@ -59,7 +59,7 @@ public interface VView extends VElement {
 	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Root EClass</em>' reference.
 	 * @see #getRootEClass()
 	 * @generated
@@ -75,7 +75,7 @@ public interface VView extends VElement {
 	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Children</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getView_Children()
 	 * @model containment="true"
@@ -133,8 +133,8 @@ public interface VView extends VElement {
 	VViewModelProperties getLoadingProperties();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VView#getLoadingProperties
-	 * <em>Loading Properties</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.model.VView#getLoadingProperties <em>Loading
+	 * Properties</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewFactory.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewFactory.java
index 1ff0377c58..09d4ebb409 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewFactory.java
@@ -29,7 +29,7 @@ public interface VViewFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	VViewFactory eINSTANCE = org.eclipse.emf.ecp.view.spi.model.impl.VViewFactoryImpl.init();
@@ -38,7 +38,7 @@ public interface VViewFactory extends EFactory {
 	 * Returns a new object of class '<em>Diagnostic</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Diagnostic</em>'.
 	 * @generated
 	 */
@@ -48,7 +48,7 @@ public interface VViewFactory extends EFactory {
 	 * Returns a new object of class '<em>View</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>View</em>'.
 	 * @generated
 	 */
@@ -58,7 +58,7 @@ public interface VViewFactory extends EFactory {
 	 * Returns a new object of class '<em>Control</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Control</em>'.
 	 * @generated
 	 */
@@ -81,7 +81,6 @@ public interface VViewFactory extends EFactory {
 	 *
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return a new object of class '<em>Date Time Display Attachment</em>'.
 	 * @generated
 	 */
@@ -91,7 +90,7 @@ public interface VViewFactory extends EFactory {
 	 * Returns a new object of class '<em>Feature Path Domain Model Reference</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Feature Path Domain Model Reference</em>'.
 	 * @generated
 	 */
@@ -101,7 +100,7 @@ public interface VViewFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewModelLoadingProperties.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewModelLoadingProperties.java
index 1d8eb26013..e68242deff 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewModelLoadingProperties.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewModelLoadingProperties.java
@@ -26,8 +26,8 @@ import org.eclipse.emf.common.util.EMap;
  *        <ul>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties#getInheritableProperties
  *        <em>Inheritable Properties</em>}</li>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties#getNonInheritableProperties
- *        <em>Non Inheritable Properties</em>}</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties#getNonInheritableProperties <em>Non
+ *        Inheritable Properties</em>}</li>
  *        </ul>
  *
  * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getViewModelLoadingProperties()
@@ -45,11 +45,11 @@ public interface VViewModelLoadingProperties extends VViewModelProperties {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Inheritable Properties</em>' map.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getViewModelLoadingProperties_InheritableProperties()
-	 * @model mapType=
-	 *        "org.eclipse.emf.ecp.view.spi.model.StringToObjectMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EJavaObject>"
+	 * @model mapType="org.eclipse.emf.ecp.view.spi.model.StringToObjectMapEntry<org.eclipse.emf.ecore.EString,
+	 *        org.eclipse.emf.ecore.EJavaObject>"
 	 * @generated
 	 */
 	EMap<String, Object> getInheritableProperties();
@@ -64,11 +64,11 @@ public interface VViewModelLoadingProperties extends VViewModelProperties {
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Non Inheritable Properties</em>' map.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getViewModelLoadingProperties_NonInheritableProperties()
-	 * @model mapType=
-	 *        "org.eclipse.emf.ecp.view.spi.model.StringToObjectMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EJavaObject>"
+	 * @model mapType="org.eclipse.emf.ecp.view.spi.model.StringToObjectMapEntry<org.eclipse.emf.ecore.EString,
+	 *        org.eclipse.emf.ecore.EJavaObject>"
 	 * @generated
 	 */
 	EMap<String, Object> getNonInheritableProperties();
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java
index 91180456e8..4c8511c138 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VViewPackage.java
@@ -163,8 +163,8 @@ public interface VViewPackage extends EPackage {
 	int ATTACHMENT_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference
-	 * <em>Domain Model Reference</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference <em>Domain Model
+	 * Reference</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -325,7 +325,6 @@ public interface VViewPackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -418,7 +417,6 @@ public interface VViewPackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -478,8 +476,8 @@ public interface VViewPackage extends EPackage {
 	int VIEW_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainedElementImpl
-	 * <em>Contained Element</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainedElementImpl <em>Contained
+	 * Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -566,7 +564,6 @@ public interface VViewPackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -671,7 +668,6 @@ public interface VViewPackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -698,8 +694,8 @@ public interface VViewPackage extends EPackage {
 	int CONTAINER_FEATURE_COUNT = ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainedContainerImpl
-	 * <em>Contained Container</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainedContainerImpl <em>Contained
+	 * Container</em>}' class.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.4
@@ -793,7 +789,6 @@ public interface VViewPackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -898,7 +893,6 @@ public interface VViewPackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
@@ -935,8 +929,8 @@ public interface VViewPackage extends EPackage {
 	int CONTROL_FEATURE_COUNT = CONTAINED_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelProperties
-	 * <em>Model Properties</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelProperties <em>Model
+	 * Properties</em>}' class.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
@@ -1005,8 +999,8 @@ public interface VViewPackage extends EPackage {
 	int VIEW_MODEL_LOADING_PROPERTIES_FEATURE_COUNT = VIEW_MODEL_PROPERTIES_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VStringToObjectMapEntryImpl
-	 * <em>String To Object Map Entry</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VStringToObjectMapEntryImpl <em>String
+	 * To Object Map Entry</em>}' class.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
@@ -1086,6 +1080,43 @@ public interface VViewPackage extends EPackage {
 	int DATE_TIME_DISPLAY_ATTACHMENT_FEATURE_COUNT = ATTACHMENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip <em>Has Tooltip</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip
+	 * @see org.eclipse.emf.ecp.view.spi.model.impl.VViewPackageImpl#getHasTooltip()
+	 * @generated
+	 */
+	int HAS_TOOLTIP = 14;
+
+	/**
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int HAS_TOOLTIP__TOOLTIP = 0;
+
+	/**
+	 * The number of structural features of the '<em>Has Tooltip</em>' class.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int HAS_TOOLTIP_FEATURE_COUNT = 1;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.LabelAlignment <em>Label Alignment</em>}'
 	 * enum.
 	 * <!-- begin-user-doc -->
@@ -1095,11 +1126,11 @@ public interface VViewPackage extends EPackage {
 	 * @see org.eclipse.emf.ecp.view.spi.model.impl.VViewPackageImpl#getLabelAlignment()
 	 * @generated
 	 */
-	int LABEL_ALIGNMENT = 14;
+	int LABEL_ALIGNMENT = 15;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType
-	 * <em>Date Time Display Type</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType <em>Date Time Display
+	 * Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.8
@@ -1108,7 +1139,7 @@ public interface VViewPackage extends EPackage {
 	 * @see org.eclipse.emf.ecp.view.spi.model.impl.VViewPackageImpl#getDateTimeDisplayType()
 	 * @generated
 	 */
-	int DATE_TIME_DISPLAY_TYPE = 15;
+	int DATE_TIME_DISPLAY_TYPE = 16;
 
 	/**
 	 * The meta object id for the '<em>Domain Model Reference Change Listener</em>' data type.
@@ -1120,7 +1151,7 @@ public interface VViewPackage extends EPackage {
 	 * @see org.eclipse.emf.ecp.view.spi.model.impl.VViewPackageImpl#getDomainModelReferenceChangeListener()
 	 * @generated
 	 */
-	int DOMAIN_MODEL_REFERENCE_CHANGE_LISTENER = 16;
+	int DOMAIN_MODEL_REFERENCE_CHANGE_LISTENER = 17;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VElement <em>Element</em>}'.
@@ -1200,8 +1231,8 @@ public interface VViewPackage extends EPackage {
 	EAttribute getElement_Readonly();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VElement#getDiagnostic <em>Diagnostic</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VElement#getDiagnostic <em>Diagnostic</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1213,8 +1244,8 @@ public interface VViewPackage extends EPackage {
 	EReference getElement_Diagnostic();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VElement#getAttachments <em>Attachments</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VElement#getAttachments <em>Attachments</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1232,7 +1263,6 @@ public interface VViewPackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Uuid</em>'.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VElement#getUuid()
 	 * @see #getElement()
@@ -1252,8 +1282,8 @@ public interface VViewPackage extends EPackage {
 	EClass getDiagnostic();
 
 	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VDiagnostic#getDiagnostics <em>Diagnostics</em>}'.
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VDiagnostic#getDiagnostics <em>Diagnostics</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1276,8 +1306,8 @@ public interface VViewPackage extends EPackage {
 	EClass getView();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.ecp.view.spi.model.VView#getRootEClass
-	 * <em>Root EClass</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.ecp.view.spi.model.VView#getRootEClass <em>Root
+	 * EClass</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1289,8 +1319,8 @@ public interface VViewPackage extends EPackage {
 	EReference getView_RootEClass();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VView#getChildren <em>Children</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VView#getChildren <em>Children</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1302,8 +1332,8 @@ public interface VViewPackage extends EPackage {
 	EReference getView_Children();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.spi.model.VView#getEcorePath
-	 * <em>Ecore Path</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.spi.model.VView#getEcorePath <em>Ecore
+	 * Path</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.3
@@ -1316,8 +1346,8 @@ public interface VViewPackage extends EPackage {
 	EAttribute getView_EcorePath();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VView#getLoadingProperties <em>Loading Properties</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VView#getLoadingProperties <em>Loading Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
@@ -1330,8 +1360,8 @@ public interface VViewPackage extends EPackage {
 	EReference getView_LoadingProperties();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VContainedElement
-	 * <em>Contained Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VContainedElement <em>Contained
+	 * Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1353,8 +1383,8 @@ public interface VViewPackage extends EPackage {
 	EClass getControl();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VControl#getDomainModelReference <em>Domain Model Reference</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VControl#getDomainModelReference <em>Domain Model Reference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1379,9 +1409,9 @@ public interface VViewPackage extends EPackage {
 	EClass getViewModelLoadingProperties();
 
 	/**
-	 * Returns the meta object for the map '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties#getInheritableProperties
-	 * <em>Inheritable Properties</em>}'.
+	 * Returns the meta object for the map
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties#getInheritableProperties <em>Inheritable
+	 * Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
@@ -1394,9 +1424,9 @@ public interface VViewPackage extends EPackage {
 	EReference getViewModelLoadingProperties_InheritableProperties();
 
 	/**
-	 * Returns the meta object for the map '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties#getNonInheritableProperties
-	 * <em>Non Inheritable Properties</em>}'.
+	 * Returns the meta object for the map
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties#getNonInheritableProperties <em>Non
+	 * Inheritable Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
@@ -1409,8 +1439,8 @@ public interface VViewPackage extends EPackage {
 	EReference getViewModelLoadingProperties_NonInheritableProperties();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelProperties
-	 * <em>Model Properties</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelProperties <em>Model
+	 * Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
@@ -1422,8 +1452,8 @@ public interface VViewPackage extends EPackage {
 	EClass getViewModelProperties();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment
-	 * <em>Date Time Display Attachment</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment <em>Date
+	 * Time Display Attachment</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.8
@@ -1435,8 +1465,8 @@ public interface VViewPackage extends EPackage {
 	EClass getDateTimeDisplayAttachment();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment#getDisplayType <em>Display Type</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment#getDisplayType <em>Display Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.8
@@ -1449,6 +1479,34 @@ public interface VViewPackage extends EPackage {
 	EAttribute getDateTimeDisplayAttachment_DisplayType();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip <em>Has Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @return the meta object for class '<em>Has Tooltip</em>'.
+	 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip
+	 * @generated
+	 */
+	EClass getHasTooltip();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip#getTooltip
+	 * <em>Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Tooltip</em>'.
+	 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip#getTooltip()
+	 * @see #getHasTooltip()
+	 * @generated
+	 */
+	EAttribute getHasTooltip_Tooltip();
+
+	/**
 	 * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Object Map Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
@@ -1500,8 +1558,8 @@ public interface VViewPackage extends EPackage {
 	EClass getContainer();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VContainer#getChildren <em>Children</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VContainer#getChildren <em>Children</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1513,8 +1571,8 @@ public interface VViewPackage extends EPackage {
 	EReference getContainer_Children();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VContainedContainer
-	 * <em>Contained Container</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VContainedContainer <em>Contained
+	 * Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.4
@@ -1539,8 +1597,8 @@ public interface VViewPackage extends EPackage {
 	EAttribute getControl_LabelAlignment();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.model.LabelAlignment
-	 * <em>Label Alignment</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.model.LabelAlignment <em>Label
+	 * Alignment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1551,8 +1609,8 @@ public interface VViewPackage extends EPackage {
 	EEnum getLabelAlignment();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType
-	 * <em>Date Time Display Type</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType <em>Date Time
+	 * Display Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.8
@@ -1564,9 +1622,9 @@ public interface VViewPackage extends EPackage {
 	EEnum getDateTimeDisplayType();
 
 	/**
-	 * Returns the meta object for data type '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener
-	 * <em>Domain Model Reference Change Listener</em>}'.
+	 * Returns the meta object for data type
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener <em>Domain Model Reference Change
+	 * Listener</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.3
@@ -1579,8 +1637,8 @@ public interface VViewPackage extends EPackage {
 	EDataType getDomainModelReferenceChangeListener();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference
-	 * <em>Domain Model Reference</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference <em>Domain
+	 * Model Reference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1591,8 +1649,8 @@ public interface VViewPackage extends EPackage {
 	EClass getDomainModelReference();
 
 	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#getChangeListener <em>Change Listener</em>}'.
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference#getChangeListener <em>Change Listener</em>}'.
 	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.3
@@ -1617,9 +1675,9 @@ public interface VViewPackage extends EPackage {
 	EClass getFeaturePathDomainModelReference();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEFeature
-	 * <em>Domain Model EFeature</em>}'.
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEFeature <em>Domain
+	 * Model EFeature</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -1631,8 +1689,8 @@ public interface VViewPackage extends EPackage {
 	EReference getFeaturePathDomainModelReference_DomainModelEFeature();
 
 	/**
-	 * Returns the meta object for the reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEReferencePath
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference#getDomainModelEReferencePath
 	 * <em>Domain Model EReference Path</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1682,8 +1740,8 @@ public interface VViewPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VElementImpl <em>Element</em>
-		 * }' class.
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VElementImpl
+		 * <em>Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
@@ -1763,7 +1821,6 @@ public interface VViewPackage extends EPackage {
 		 *
 		 * @since 1.9
 		 *        <!-- end-user-doc -->
-		 *
 		 * @generated
 		 */
 		EAttribute ELEMENT__UUID = eINSTANCE.getElement_Uuid();
@@ -1852,8 +1909,8 @@ public interface VViewPackage extends EPackage {
 		EClass CONTAINED_ELEMENT = eINSTANCE.getContainedElement();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VControlImpl <em>Control</em>
-		 * }' class.
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VControlImpl
+		 * <em>Control</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
@@ -1873,9 +1930,9 @@ public interface VViewPackage extends EPackage {
 		EReference CONTROL__DOMAIN_MODEL_REFERENCE = eINSTANCE.getControl_DomainModelReference();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.spi.model.impl.VViewModelLoadingPropertiesImpl
-		 * <em>Model Loading Properties</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.model.impl.VViewModelLoadingPropertiesImpl <em>Model Loading
+		 * Properties</em>}' class.
 		 * <!-- begin-user-doc -->
 		 *
 		 * @since 1.7
@@ -1909,8 +1966,8 @@ public interface VViewPackage extends EPackage {
 			.getViewModelLoadingProperties_NonInheritableProperties();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelProperties
-		 * <em>Model Properties</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelProperties <em>Model
+		 * Properties</em>}' class.
 		 * <!-- begin-user-doc -->
 		 *
 		 * @since 1.7
@@ -1922,9 +1979,9 @@ public interface VViewPackage extends EPackage {
 		EClass VIEW_MODEL_PROPERTIES = eINSTANCE.getViewModelProperties();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.spi.model.impl.VDateTimeDisplayAttachmentImpl
-		 * <em>Date Time Display Attachment</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.model.impl.VDateTimeDisplayAttachmentImpl <em>Date Time Display
+		 * Attachment</em>}' class.
 		 * <!-- begin-user-doc -->
 		 *
 		 * @since 1.8
@@ -1946,6 +2003,31 @@ public interface VViewPackage extends EPackage {
 		EAttribute DATE_TIME_DISPLAY_ATTACHMENT__DISPLAY_TYPE = eINSTANCE.getDateTimeDisplayAttachment_DisplayType();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip <em>Has Tooltip</em>}'
+		 * class.
+		 * <!-- begin-user-doc -->
+		 * 
+		 * @since 1.13
+		 *        <!-- end-user-doc -->
+		 *
+		 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip
+		 * @see org.eclipse.emf.ecp.view.spi.model.impl.VViewPackageImpl#getHasTooltip()
+		 * @generated
+		 */
+		EClass HAS_TOOLTIP = eINSTANCE.getHasTooltip();
+
+		/**
+		 * The meta object literal for the '<em><b>Tooltip</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * 
+		 * @since 1.13
+		 *        <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute HAS_TOOLTIP__TOOLTIP = eINSTANCE.getHasTooltip_Tooltip();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.impl.VStringToObjectMapEntryImpl
 		 * <em>String To Object Map Entry</em>}' class.
 		 * <!-- begin-user-doc -->
@@ -2022,8 +2104,8 @@ public interface VViewPackage extends EPackage {
 		EAttribute CONTROL__LABEL_ALIGNMENT = eINSTANCE.getControl_LabelAlignment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.LabelAlignment
-		 * <em>Label Alignment</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.LabelAlignment <em>Label
+		 * Alignment</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
@@ -2034,8 +2116,8 @@ public interface VViewPackage extends EPackage {
 		EEnum LABEL_ALIGNMENT = eINSTANCE.getLabelAlignment();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType
-		 * <em>Date Time Display Type</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType <em>Date Time
+		 * Display Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 *
 		 * @since 1.8
@@ -2059,8 +2141,8 @@ public interface VViewPackage extends EPackage {
 		EDataType DOMAIN_MODEL_REFERENCE_CHANGE_LISTENER = eINSTANCE.getDomainModelReferenceChangeListener();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference
-		 * <em>Domain Model Reference</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference <em>Domain
+		 * Model Reference</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
@@ -2081,9 +2163,9 @@ public interface VViewPackage extends EPackage {
 		EAttribute DOMAIN_MODEL_REFERENCE__CHANGE_LISTENER = eINSTANCE.getDomainModelReference_ChangeListener();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl
-		 * <em>Feature Path Domain Model Reference</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl <em>Feature Path Domain
+		 * Model Reference</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/Activator.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/Activator.java
index 211121e536..b1ea01d21e 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/Activator.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/Activator.java
@@ -1,127 +1,127 @@
-/*******************************************************************************

- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Eugen Neufeld - initial API and implementation

- ******************************************************************************/

-package org.eclipse.emf.ecp.view.spi.model.impl;

-

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Plugin;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emf.ecp.view.model.internal.reporting.LogConsumer;

-import org.eclipse.emfforms.spi.common.report.AbstractReport;

-import org.eclipse.emfforms.spi.common.report.ReportService;

-import org.eclipse.emfforms.spi.common.report.ReportServiceConsumer;

-import org.osgi.framework.BundleContext;

-import org.osgi.framework.ServiceReference;

-import org.osgi.framework.ServiceRegistration;

-

-/**

- * @author Eugen Neufeld

- * @since 1.2

- *

- */

-public class Activator extends Plugin {

-	/**

-	 * The plug-in ID.

-	 */

-	public static final String PLUGIN_ID = "org.eclipse.emf.ecp.view.model"; //$NON-NLS-1$

-

-	/**

-	 * The shared instance.

-	 */

-	private static Activator plugin;

-

-	private ServiceReference<ReportService> reportServiceReference;

-

-	private ServiceRegistration<ReportServiceConsumer> registerLogConsumerService;

-

-	/**

-	 * The constructor.

-	 */

-	public Activator() {

-	}

-

-	// BEGIN SUPRESS CATCH EXCEPTION

-	@Override

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-		final LogConsumer logConsumer = new LogConsumer();

-		registerLogConsumerService = context.registerService(ReportServiceConsumer.class, logConsumer, null);

-	}

-

-	@Override

-	public void stop(BundleContext context) throws Exception {

-		registerLogConsumerService.unregister();

-		plugin = null;

-		super.stop(context);

-	}

-

-	// END SUPRESS CATCH EXCEPTION

-

-	/**

-	 * Returns the shared instance.

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Logs exception.

-	 *

-	 * @param e the {@link Exception} to log

-	 */

-	public static void logException(Exception e) {

-		getDefault().getLog().log(

-			new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), e.getMessage(), e));

-	}

-

-	/**

-	 * Logs messages.

-	 *

-	 * @param severity the severity to use for logging

-	 * @param message the message to log

-	 */

-	public static void logMessage(int severity, String message) {

-		getDefault().getLog().log(

-			new Status(severity, Activator.getDefault().getBundle().getSymbolicName(), message));

-	}

-

-	/**

-	 * Logs a {@link AbstractReport}.

-	 *

-	 * @param report

-	 *            the {@link AbstractReport} to be logged

-	 * @since 1.6

-	 */

-	public static void log(AbstractReport report) {

-		getDefault().getLog().log(

-			new Status(report.getSeverity(),

-				PLUGIN_ID,

-				report.getMessage(),

-				report.getException()));

-	}

-

-	/**

-	 * Returns the {@link ReportService}.

-	 *

-	 * @return the {@link ReportService}

-	 * @since 1.6

-	 */

-	public ReportService getReportService() {

-		if (reportServiceReference == null) {

-			reportServiceReference = plugin.getBundle().getBundleContext()

-				.getServiceReference(ReportService.class);

-		}

-		return plugin.getBundle().getBundleContext().getService(reportServiceReference);

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.model.impl;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecp.view.model.internal.reporting.LogConsumer;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.common.report.ReportServiceConsumer;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+
+/**
+ * @author Eugen Neufeld
+ * @since 1.2
+ *
+ */
+public class Activator extends Plugin {
+	/**
+	 * The plug-in ID.
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.emf.ecp.view.model"; //$NON-NLS-1$
+
+	/**
+	 * The shared instance.
+	 */
+	private static Activator plugin;
+
+	private ServiceReference<ReportService> reportServiceReference;
+
+	private ServiceRegistration<ReportServiceConsumer> registerLogConsumerService;
+
+	/**
+	 * The constructor.
+	 */
+	public Activator() {
+	}
+
+	// BEGIN SUPRESS CATCH EXCEPTION
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+		final LogConsumer logConsumer = new LogConsumer();
+		registerLogConsumerService = context.registerService(ReportServiceConsumer.class, logConsumer, null);
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		registerLogConsumerService.unregister();
+		plugin = null;
+		super.stop(context);
+	}
+
+	// END SUPRESS CATCH EXCEPTION
+
+	/**
+	 * Returns the shared instance.
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Logs exception.
+	 *
+	 * @param e the {@link Exception} to log
+	 */
+	public static void logException(Exception e) {
+		getDefault().getLog().log(
+			new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), e.getMessage(), e));
+	}
+
+	/**
+	 * Logs messages.
+	 *
+	 * @param severity the severity to use for logging
+	 * @param message the message to log
+	 */
+	public static void logMessage(int severity, String message) {
+		getDefault().getLog().log(
+			new Status(severity, Activator.getDefault().getBundle().getSymbolicName(), message));
+	}
+
+	/**
+	 * Logs a {@link AbstractReport}.
+	 *
+	 * @param report
+	 *            the {@link AbstractReport} to be logged
+	 * @since 1.6
+	 */
+	public static void log(AbstractReport report) {
+		getDefault().getLog().log(
+			new Status(report.getSeverity(),
+				PLUGIN_ID,
+				report.getMessage(),
+				report.getException()));
+	}
+
+	/**
+	 * Returns the {@link ReportService}.
+	 *
+	 * @return the {@link ReportService}
+	 * @since 1.6
+	 */
+	public ReportService getReportService() {
+		if (reportServiceReference == null) {
+			reportServiceReference = plugin.getBundle().getBundleContext()
+				.getServiceReference(ReportService.class);
+		}
+		return plugin.getBundle().getBundleContext().getService(reportServiceReference);
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VAttachmentImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VAttachmentImpl.java
index 8e97a4ba4c..729ed96e0b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VAttachmentImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VAttachmentImpl.java
@@ -19,8 +19,9 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Attachment</b></em>'.
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
+ *        <!-- end-user-doc -->
  *
  * @generated
  */
@@ -28,7 +29,7 @@ public abstract class VAttachmentImpl extends EObjectImpl implements VAttachment
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VAttachmentImpl() {
@@ -38,7 +39,7 @@ public abstract class VAttachmentImpl extends EObjectImpl implements VAttachment
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedContainerImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedContainerImpl.java
index 905717370f..7ce5d47d2f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedContainerImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedContainerImpl.java
@@ -27,14 +27,15 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Composite Collection</b></em>'.
+ * 
  * @since 1.4
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainedContainerImpl#getChildren <em>Children</em>}</li>
- * </ul>
+ *        <!-- end-user-doc -->
+ *        <p>
+ *        The following features are implemented:
+ *        </p>
+ *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainedContainerImpl#getChildren <em>Children</em>}</li>
+ *        </ul>
  *
  * @generated
  */
@@ -43,7 +44,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -53,7 +54,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VContainedContainerImpl() {
@@ -63,7 +64,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,7 +75,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,7 +90,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -104,7 +105,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,7 +120,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -137,7 +138,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,7 +154,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,7 +169,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -187,7 +188,7 @@ public abstract class VContainedContainerImpl extends VContainedElementImpl impl
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedElementImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedElementImpl.java
index 1114df0aa2..d7e8b6e9fb 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedElementImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainedElementImpl.java
@@ -28,7 +28,7 @@ public abstract class VContainedElementImpl extends VElementImpl implements VCon
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VContainedElementImpl() {
@@ -38,7 +38,7 @@ public abstract class VContainedElementImpl extends VElementImpl implements VCon
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainerImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainerImpl.java
index c24b48d33d..3ffae10f4e 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainerImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VContainerImpl.java
@@ -26,14 +26,15 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Container</b></em>'.
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainerImpl#getChildren <em>Children</em>}</li>
- * </ul>
+ *        <!-- end-user-doc -->
+ *        <p>
+ *        The following features are implemented:
+ *        </p>
+ *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VContainerImpl#getChildren <em>Children</em>}</li>
+ *        </ul>
  *
  * @generated
  */
@@ -42,7 +43,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -52,7 +53,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VContainerImpl() {
@@ -62,7 +63,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,7 +74,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -88,7 +89,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,7 +104,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -118,7 +119,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -136,7 +137,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -152,7 +153,7 @@ public abstract class VContainerImpl extends VElementImpl implements VContainer
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VControlImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VControlImpl.java
index e832077fc8..349c18f6a2 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VControlImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VControlImpl.java
@@ -36,10 +36,10 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  *        The following features are implemented:
  *        </p>
  *        <ul>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VControlImpl#getLabelAlignment <em>Label Alignment</em>}
- *        </li>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VControlImpl#getDomainModelReference
- *        <em>Domain Model Reference</em>}</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VControlImpl#getLabelAlignment <em>Label
+ *        Alignment</em>}</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VControlImpl#getDomainModelReference <em>Domain Model
+ *        Reference</em>}</li>
  *        </ul>
  *
  * @generated
@@ -49,7 +49,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	 * The default value of the '{@link #getLabelAlignment() <em>Label Alignment</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLabelAlignment()
 	 * @generated
 	 * @ordered
@@ -60,7 +60,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	 * The cached value of the '{@link #getLabelAlignment() <em>Label Alignment</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLabelAlignment()
 	 * @generated
 	 * @ordered
@@ -72,7 +72,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDomainModelReference()
 	 * @generated
 	 * @ordered
@@ -82,7 +82,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VControlImpl() {
@@ -92,7 +92,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,7 +103,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -114,21 +114,20 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDomainModelReference(VDomainModelReference newDomainModelReference,
 		NotificationChain msgs) {
-		final VDomainModelReference oldDomainModelReference = domainModelReference;
+		VDomainModelReference oldDomainModelReference = domainModelReference;
 		domainModelReference = newDomainModelReference;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				VViewPackage.CONTROL__DOMAIN_MODEL_REFERENCE, oldDomainModelReference, newDomainModelReference);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -136,35 +135,31 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setDomainModelReference(VDomainModelReference newDomainModelReference) {
 		if (newDomainModelReference != domainModelReference) {
 			NotificationChain msgs = null;
-			if (domainModelReference != null) {
+			if (domainModelReference != null)
 				msgs = ((InternalEObject) domainModelReference).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE - VViewPackage.CONTROL__DOMAIN_MODEL_REFERENCE, null, msgs);
-			}
-			if (newDomainModelReference != null) {
+			if (newDomainModelReference != null)
 				msgs = ((InternalEObject) newDomainModelReference).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE - VViewPackage.CONTROL__DOMAIN_MODEL_REFERENCE, null, msgs);
-			}
 			msgs = basicSetDomainModelReference(newDomainModelReference, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.CONTROL__DOMAIN_MODEL_REFERENCE,
 				newDomainModelReference, newDomainModelReference));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,7 +174,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -190,23 +185,22 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setLabelAlignment(LabelAlignment newLabelAlignment) {
-		final LabelAlignment oldLabelAlignment = labelAlignment;
+		LabelAlignment oldLabelAlignment = labelAlignment;
 		labelAlignment = newLabelAlignment == null ? LABEL_ALIGNMENT_EDEFAULT : newLabelAlignment;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.CONTROL__LABEL_ALIGNMENT,
 				oldLabelAlignment, labelAlignment));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -223,7 +217,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -242,7 +236,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -261,7 +255,7 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -278,16 +272,15 @@ public class VControlImpl extends VContainedElementImpl implements VControl {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (labelAlignment: "); //$NON-NLS-1$
 		result.append(labelAlignment);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDateTimeDisplayAttachmentImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDateTimeDisplayAttachmentImpl.java
index 32418e116f..deaf3461ad 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDateTimeDisplayAttachmentImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDateTimeDisplayAttachmentImpl.java
@@ -28,8 +28,8 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  *        The following features are implemented:
  *        </p>
  *        <ul>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VDateTimeDisplayAttachmentImpl#getDisplayType
- *        <em>Display Type</em>}</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VDateTimeDisplayAttachmentImpl#getDisplayType <em>Display
+ *        Type</em>}</li>
  *        </ul>
  *
  * @generated
@@ -39,7 +39,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	 * The default value of the '{@link #getDisplayType() <em>Display Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDisplayType()
 	 * @generated
 	 * @ordered
@@ -50,7 +50,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	 * The cached value of the '{@link #getDisplayType() <em>Display Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDisplayType()
 	 * @generated
 	 * @ordered
@@ -60,7 +60,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VDateTimeDisplayAttachmentImpl() {
@@ -70,7 +70,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,7 +81,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -92,23 +92,22 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setDisplayType(DateTimeDisplayType newDisplayType) {
-		final DateTimeDisplayType oldDisplayType = displayType;
+		DateTimeDisplayType oldDisplayType = displayType;
 		displayType = newDisplayType == null ? DISPLAY_TYPE_EDEFAULT : newDisplayType;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
 				VViewPackage.DATE_TIME_DISPLAY_ATTACHMENT__DISPLAY_TYPE, oldDisplayType, displayType));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,7 +122,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,7 +138,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -155,7 +154,7 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -170,16 +169,15 @@ public class VDateTimeDisplayAttachmentImpl extends VAttachmentImpl implements V
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (displayType: "); //$NON-NLS-1$
 		result.append(displayType);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDiagnosticImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDiagnosticImpl.java
index 16255eb501..95cae0ec42 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDiagnosticImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VDiagnosticImpl.java
@@ -33,14 +33,15 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>VDiagnostic</b></em>'.
+ * 
  * @since 1.2
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VDiagnosticImpl#getDiagnostics <em>Diagnostics</em>}</li>
- * </ul>
+ *        <!-- end-user-doc -->
+ *        <p>
+ *        The following features are implemented:
+ *        </p>
+ *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VDiagnosticImpl#getDiagnostics <em>Diagnostics</em>}</li>
+ *        </ul>
  *
  * @generated
  */
@@ -50,7 +51,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	 * The cached value of the '{@link #getDiagnostics() <em>Diagnostics</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDiagnostics()
 	 * @generated
 	 * @ordered
@@ -60,7 +61,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VDiagnosticImpl() {
@@ -70,7 +71,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,7 +82,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,7 +96,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,7 +111,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -128,7 +129,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,7 +145,7 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -159,16 +160,15 @@ public class VDiagnosticImpl extends EObjectImpl implements VDiagnostic {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (diagnostics: "); //$NON-NLS-1$
 		result.append(diagnostics);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java
index d939d8c159..3ab254fd0c 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java
@@ -55,7 +55,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -66,7 +66,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -101,7 +101,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The default value of the '{@link #isVisible() <em>Visible</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isVisible()
 	 * @generated
 	 * @ordered
@@ -112,7 +112,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The cached value of the '{@link #isVisible() <em>Visible</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isVisible()
 	 * @generated
 	 * @ordered
@@ -123,7 +123,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isEnabled()
 	 * @generated
 	 * @ordered
@@ -134,7 +134,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The cached value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isEnabled()
 	 * @generated
 	 * @ordered
@@ -145,7 +145,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The default value of the '{@link #isReadonly() <em>Readonly</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isReadonly()
 	 * @generated
 	 * @ordered
@@ -156,7 +156,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The cached value of the '{@link #isReadonly() <em>Readonly</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isReadonly()
 	 * @generated
 	 * @ordered
@@ -167,7 +167,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The cached value of the '{@link #getDiagnostic() <em>Diagnostic</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDiagnostic()
 	 * @generated
 	 * @ordered
@@ -178,7 +178,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 * The cached value of the '{@link #getAttachments() <em>Attachments</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getAttachments()
 	 * @generated
 	 * @ordered
@@ -191,7 +191,6 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #getUuid()
 	 * @generated
 	 * @ordered
@@ -204,7 +203,6 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @see #getUuid()
 	 * @generated
 	 * @ordered
@@ -214,7 +212,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VElementImpl() {
@@ -224,7 +222,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -235,7 +233,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -246,16 +244,15 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setName(String newName) {
-		final String oldName = name;
+		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.ELEMENT__NAME, oldName, name));
-		}
 	}
 
 	/**
@@ -279,17 +276,16 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 */
 	@Override
 	public void setLabel(String newLabel) {
-		final String oldLabel = label;
+		String oldLabel = label;
 		label = newLabel;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.ELEMENT__LABEL, oldLabel, label));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -300,22 +296,21 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setVisible(boolean newVisible) {
-		final boolean oldVisible = visible;
+		boolean oldVisible = visible;
 		visible = newVisible;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.ELEMENT__VISIBLE, oldVisible, visible));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -326,22 +321,21 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setEnabled(boolean newEnabled) {
-		final boolean oldEnabled = enabled;
+		boolean oldEnabled = enabled;
 		enabled = newEnabled;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.ELEMENT__ENABLED, oldEnabled, enabled));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -352,23 +346,22 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setReadonly(boolean newReadonly) {
-		final boolean oldReadonly = readonly;
+		boolean oldReadonly = readonly;
 		readonly = newReadonly;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(
 				new ENotificationImpl(this, Notification.SET, VViewPackage.ELEMENT__READONLY, oldReadonly, readonly));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -379,20 +372,19 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDiagnostic(VDiagnostic newDiagnostic, NotificationChain msgs) {
-		final VDiagnostic oldDiagnostic = diagnostic;
+		VDiagnostic oldDiagnostic = diagnostic;
 		diagnostic = newDiagnostic;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				VViewPackage.ELEMENT__DIAGNOSTIC, oldDiagnostic, newDiagnostic);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -400,35 +392,31 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setDiagnostic(VDiagnostic newDiagnostic) {
 		if (newDiagnostic != diagnostic) {
 			NotificationChain msgs = null;
-			if (diagnostic != null) {
+			if (diagnostic != null)
 				msgs = ((InternalEObject) diagnostic).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE - VViewPackage.ELEMENT__DIAGNOSTIC, null, msgs);
-			}
-			if (newDiagnostic != null) {
+			if (newDiagnostic != null)
 				msgs = ((InternalEObject) newDiagnostic).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE - VViewPackage.ELEMENT__DIAGNOSTIC, null, msgs);
-			}
 			msgs = basicSetDiagnostic(newDiagnostic, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.ELEMENT__DIAGNOSTIC, newDiagnostic,
 				newDiagnostic));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -445,7 +433,6 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -458,22 +445,20 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public void setUuid(String newUuid) {
-		final String oldUuid = uuid;
+		String oldUuid = uuid;
 		uuid = newUuid;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.ELEMENT__UUID, oldUuid, uuid));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -490,7 +475,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -519,7 +504,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -558,7 +543,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -595,7 +580,7 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -624,16 +609,15 @@ public abstract class VElementImpl extends EObjectImpl implements VElement {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(", label: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java
index caf7439c7d..8cf03f095f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VFeaturePathDomainModelReferenceImpl.java
@@ -50,8 +50,8 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  * The following features are implemented:
  * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl#getChangeListener
- * <em>Change Listener</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl#getChangeListener <em>Change
+ * Listener</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl#getDomainModelEFeature
  * <em>Domain Model EFeature</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VFeaturePathDomainModelReferenceImpl#getDomainModelEReferencePath
@@ -378,7 +378,13 @@ public class VFeaturePathDomainModelReferenceImpl extends EObjectImpl implements
 					&& !domainModelEFeatureValue.getEContainingClass().isInterface()) {
 					child = EcoreUtil.create(domainModelEFeatureValue.getEContainingClass());
 				}
-				currentResolvedEObject.eSet(eReference, child);
+				if (child != null) {
+					/*
+					 * only set the reference if we could create a child. otherwise we could end up in a infinite loop,
+					 * because a null-to-null set produces a non-touch notification. This might trigger resolve again.
+					 */
+					currentResolvedEObject.eSet(eReference, child);
+				}
 			}
 			if (child == null) {
 				break;
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VStringToObjectMapEntryImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VStringToObjectMapEntryImpl.java
index 7ba6895ee9..fddc3a6a1d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VStringToObjectMapEntryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VStringToObjectMapEntryImpl.java
@@ -31,8 +31,8 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  *        </p>
  *        <ul>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VStringToObjectMapEntryImpl#getTypedKey <em>Key</em>}</li>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VStringToObjectMapEntryImpl#getTypedValue <em>Value</em>}
- *        </li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VStringToObjectMapEntryImpl#getTypedValue
+ *        <em>Value</em>}</li>
  *        </ul>
  *
  * @generated
@@ -42,7 +42,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -53,7 +53,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -64,7 +64,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
@@ -75,7 +75,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
@@ -85,7 +85,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VStringToObjectMapEntryImpl() {
@@ -95,7 +95,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -106,7 +106,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getTypedKey() {
@@ -116,22 +116,21 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedKey(String newKey) {
-		final String oldKey = key;
+		String oldKey = key;
 		key = newKey;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.STRING_TO_OBJECT_MAP_ENTRY__KEY, oldKey,
 				key));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Object getTypedValue() {
@@ -141,22 +140,21 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedValue(Object newValue) {
-		final Object oldValue = value;
+		Object oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.STRING_TO_OBJECT_MAP_ENTRY__VALUE,
 				oldValue, value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -173,7 +171,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -192,7 +190,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -211,7 +209,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -228,16 +226,15 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (key: "); //$NON-NLS-1$
 		result.append(key);
 		result.append(", value: "); //$NON-NLS-1$
@@ -249,7 +246,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected int hash = -1;
@@ -257,14 +254,14 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int getHash() {
 		if (hash == -1) {
-			final Object theKey = getKey();
-			hash = theKey == null ? 0 : theKey.hashCode();
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
 		}
 		return hash;
 	}
@@ -272,7 +269,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -283,7 +280,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -294,7 +291,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -305,7 +302,7 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -316,12 +313,12 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object setValue(Object value) {
-		final Object oldValue = getValue();
+		Object oldValue = getValue();
 		setTypedValue(value);
 		return oldValue;
 	}
@@ -329,12 +326,12 @@ public class VStringToObjectMapEntryImpl extends EObjectImpl implements BasicEMa
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	public EMap<String, Object> getEMap() {
-		final EObject container = eContainer();
+		EObject container = eContainer();
 		return container == null ? null : (EMap<String, Object>) container.eGet(eContainmentFeature());
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java
index 5e7320898d..62423b0f66 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewFactoryImpl.java
@@ -43,17 +43,16 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static VViewFactory init() {
 		try {
-			final VViewFactory theViewFactory = (VViewFactory) EPackage.Registry.INSTANCE
-				.getEFactory(VViewPackage.eNS_URI);
+			VViewFactory theViewFactory = (VViewFactory) EPackage.Registry.INSTANCE.getEFactory(VViewPackage.eNS_URI);
 			if (theViewFactory != null) {
 				return theViewFactory;
 			}
-		} catch (final Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new VViewFactoryImpl();
@@ -63,7 +62,7 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public VViewFactoryImpl() {
@@ -72,7 +71,7 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,7 +99,7 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,7 +119,7 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,34 +139,34 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public VDiagnostic createDiagnostic() {
-		final VDiagnosticImpl diagnostic = new VDiagnosticImpl();
+		VDiagnosticImpl diagnostic = new VDiagnosticImpl();
 		return diagnostic;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public VView createView() {
-		final VViewImpl view = new VViewImpl();
+		VViewImpl view = new VViewImpl();
 		return view;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public VControl createControl() {
-		final VControlImpl control = new VControlImpl();
+		VControlImpl control = new VControlImpl();
 		return control;
 	}
 
@@ -180,7 +179,7 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	 */
 	@Override
 	public VViewModelLoadingProperties createViewModelLoadingProperties() {
-		final VViewModelLoadingPropertiesImpl viewModelLoadingProperties = new VViewModelLoadingPropertiesImpl();
+		VViewModelLoadingPropertiesImpl viewModelLoadingProperties = new VViewModelLoadingPropertiesImpl();
 		return viewModelLoadingProperties;
 	}
 
@@ -192,7 +191,7 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	 * @generated
 	 */
 	public Map.Entry<String, Object> createStringToObjectMapEntry() {
-		final VStringToObjectMapEntryImpl stringToObjectMapEntry = new VStringToObjectMapEntryImpl();
+		VStringToObjectMapEntryImpl stringToObjectMapEntry = new VStringToObjectMapEntryImpl();
 		return stringToObjectMapEntry;
 	}
 
@@ -201,34 +200,32 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	 * 
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public VDateTimeDisplayAttachment createDateTimeDisplayAttachment() {
-		final VDateTimeDisplayAttachmentImpl dateTimeDisplayAttachment = new VDateTimeDisplayAttachmentImpl();
+		VDateTimeDisplayAttachmentImpl dateTimeDisplayAttachment = new VDateTimeDisplayAttachmentImpl();
 		return dateTimeDisplayAttachment;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public LabelAlignment createLabelAlignmentFromString(EDataType eDataType, String initialValue) {
-		final LabelAlignment result = LabelAlignment.get(initialValue);
-		if (result == null) {
+		LabelAlignment result = LabelAlignment.get(initialValue);
+		if (result == null)
 			throw new IllegalArgumentException(
 				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String convertLabelAlignmentToString(EDataType eDataType, Object instanceValue) {
@@ -240,15 +237,13 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	 *
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public DateTimeDisplayType createDateTimeDisplayTypeFromString(EDataType eDataType, String initialValue) {
-		final DateTimeDisplayType result = DateTimeDisplayType.get(initialValue);
-		if (result == null) {
+		DateTimeDisplayType result = DateTimeDisplayType.get(initialValue);
+		if (result == null)
 			throw new IllegalArgumentException(
 				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
 		return result;
 	}
 
@@ -257,7 +252,6 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	 *
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public String convertDateTimeDisplayTypeToString(EDataType eDataType, Object instanceValue) {
@@ -290,18 +284,18 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public VFeaturePathDomainModelReference createFeaturePathDomainModelReference() {
-		final VFeaturePathDomainModelReferenceImpl featurePathDomainModelReference = new VFeaturePathDomainModelReferenceImpl();
+		VFeaturePathDomainModelReferenceImpl featurePathDomainModelReference = new VFeaturePathDomainModelReferenceImpl();
 		return featurePathDomainModelReference;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -311,7 +305,7 @@ public class VViewFactoryImpl extends EFactoryImpl implements VViewFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewImpl.java
index d848227b2f..e56de73ea1 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewImpl.java
@@ -42,8 +42,8 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VViewImpl#getRootEClass <em>Root EClass</em>}</li>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VViewImpl#getChildren <em>Children</em>}</li>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VViewImpl#getEcorePath <em>Ecore Path</em>}</li>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VViewImpl#getLoadingProperties <em>Loading Properties</em>}
- *        </li>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.model.impl.VViewImpl#getLoadingProperties <em>Loading
+ *        Properties</em>}</li>
  *        </ul>
  *
  * @generated
@@ -53,7 +53,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	 * The cached value of the '{@link #getRootEClass() <em>Root EClass</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getRootEClass()
 	 * @generated
 	 * @ordered
@@ -64,7 +64,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getChildren()
 	 * @generated
 	 * @ordered
@@ -110,7 +110,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected VViewImpl() {
@@ -120,7 +120,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -131,19 +131,18 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EClass getRootEClass() {
 		if (rootEClass != null && rootEClass.eIsProxy()) {
-			final InternalEObject oldRootEClass = (InternalEObject) rootEClass;
+			InternalEObject oldRootEClass = (InternalEObject) rootEClass;
 			rootEClass = (EClass) eResolveProxy(oldRootEClass);
 			if (rootEClass != oldRootEClass) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, VViewPackage.VIEW__ROOT_ECLASS,
 						oldRootEClass, rootEClass));
-				}
 			}
 		}
 		return rootEClass;
@@ -152,7 +151,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass basicGetRootEClass() {
@@ -162,23 +161,22 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void setRootEClass(EClass newRootEClass) {
-		final EClass oldRootEClass = rootEClass;
+		EClass oldRootEClass = rootEClass;
 		rootEClass = newRootEClass;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.VIEW__ROOT_ECLASS, oldRootEClass,
 				rootEClass));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -211,12 +209,11 @@ public class VViewImpl extends VElementImpl implements VView {
 	 */
 	@Override
 	public void setEcorePath(String newEcorePath) {
-		final String oldEcorePath = ecorePath;
+		String oldEcorePath = ecorePath;
 		ecorePath = newEcorePath;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(
 				new ENotificationImpl(this, Notification.SET, VViewPackage.VIEW__ECORE_PATH, oldEcorePath, ecorePath));
-		}
 	}
 
 	/**
@@ -240,16 +237,15 @@ public class VViewImpl extends VElementImpl implements VView {
 	 */
 	public NotificationChain basicSetLoadingProperties(VViewModelProperties newLoadingProperties,
 		NotificationChain msgs) {
-		final VViewModelProperties oldLoadingProperties = loadingProperties;
+		VViewModelProperties oldLoadingProperties = loadingProperties;
 		loadingProperties = newLoadingProperties;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				VViewPackage.VIEW__LOADING_PROPERTIES, oldLoadingProperties, newLoadingProperties);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -265,28 +261,24 @@ public class VViewImpl extends VElementImpl implements VView {
 	public void setLoadingProperties(VViewModelProperties newLoadingProperties) {
 		if (newLoadingProperties != loadingProperties) {
 			NotificationChain msgs = null;
-			if (loadingProperties != null) {
+			if (loadingProperties != null)
 				msgs = ((InternalEObject) loadingProperties).eInverseRemove(this,
 					EOPPOSITE_FEATURE_BASE - VViewPackage.VIEW__LOADING_PROPERTIES, null, msgs);
-			}
-			if (newLoadingProperties != null) {
+			if (newLoadingProperties != null)
 				msgs = ((InternalEObject) newLoadingProperties).eInverseAdd(this,
 					EOPPOSITE_FEATURE_BASE - VViewPackage.VIEW__LOADING_PROPERTIES, null, msgs);
-			}
 			msgs = basicSetLoadingProperties(newLoadingProperties, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, VViewPackage.VIEW__LOADING_PROPERTIES,
 				newLoadingProperties, newLoadingProperties));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -303,16 +295,15 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 		case VViewPackage.VIEW__ROOT_ECLASS:
-			if (resolve) {
+			if (resolve)
 				return getRootEClass();
-			}
 			return basicGetRootEClass();
 		case VViewPackage.VIEW__CHILDREN:
 			return getChildren();
@@ -327,7 +318,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -354,7 +345,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -379,7 +370,7 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -400,16 +391,15 @@ public class VViewImpl extends VElementImpl implements VView {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (ecorePath: "); //$NON-NLS-1$
 		result.append(ecorePath);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewModelLoadingPropertiesImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewModelLoadingPropertiesImpl.java
index 82e9be84a0..2b108ab51e 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewModelLoadingPropertiesImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewModelLoadingPropertiesImpl.java
@@ -151,13 +151,11 @@ public class VViewModelLoadingPropertiesImpl extends EObjectImpl implements VVie
 				return getInheritableProperties();
 			}
 			return getInheritableProperties().map();
-
 		case VViewPackage.VIEW_MODEL_LOADING_PROPERTIES__NON_INHERITABLE_PROPERTIES:
 			if (coreType) {
 				return getNonInheritableProperties();
 			}
 			return getNonInheritableProperties().map();
-
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java
index a6a5b056bc..0ced3fbb58 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VViewPackageImpl.java
@@ -22,7 +22,6 @@ import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecp.view.spi.model.DateTimeDisplayType;
 import org.eclipse.emf.ecp.view.spi.model.DomainModelReferenceChangeListener;
@@ -37,6 +36,7 @@ import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties;
@@ -121,6 +121,14 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 	 *
 	 * @generated
 	 */
+	private EClass hasTooltipEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
 	private EClass stringToObjectMapEntryEClass = null;
 
 	/**
@@ -238,9 +246,6 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 
 		isInited = true;
 
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
 		// Create package meta-data objects
 		theViewPackage.createPackageContents();
 
@@ -358,7 +363,6 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -549,6 +553,32 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 
 	/**
 	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EClass getHasTooltip() {
+		return hasTooltipEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getHasTooltip_Tooltip() {
+		return (EAttribute) hasTooltipEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
 	 *
 	 * @since 1.7
 	 *        <!-- end-user-doc -->
@@ -818,6 +848,9 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 		dateTimeDisplayAttachmentEClass = createEClass(DATE_TIME_DISPLAY_ATTACHMENT);
 		createEAttribute(dateTimeDisplayAttachmentEClass, DATE_TIME_DISPLAY_ATTACHMENT__DISPLAY_TYPE);
 
+		hasTooltipEClass = createEClass(HAS_TOOLTIP);
+		createEAttribute(hasTooltipEClass, HAS_TOOLTIP__TOOLTIP);
+
 		// Create enums
 		labelAlignmentEEnum = createEEnum(LABEL_ALIGNMENT);
 		dateTimeDisplayTypeEEnum = createEEnum(DATE_TIME_DISPLAY_TYPE);
@@ -851,10 +884,6 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
 
-		// Obtain other dependent packages
-		final EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE
-			.getEPackage(EcorePackage.eNS_URI);
-
 		// Create type parameters
 
 		// Set bounds for type parameters
@@ -873,7 +902,7 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 		// Initialize classes and features; add operations and parameters
 		initEClass(diagnosticEClass, VDiagnostic.class, "Diagnostic", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
 			IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDiagnostic_Diagnostics(), theEcorePackage.getEJavaObject(), "diagnostics", null, 0, -1, //$NON-NLS-1$
+		initEAttribute(getDiagnostic_Diagnostics(), ecorePackage.getEJavaObject(), "diagnostics", null, 0, -1, //$NON-NLS-1$
 			VDiagnostic.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 
@@ -888,25 +917,25 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 
 		initEClass(featurePathDomainModelReferenceEClass, VFeaturePathDomainModelReference.class,
 			"FeaturePathDomainModelReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getFeaturePathDomainModelReference_DomainModelEFeature(),
-			theEcorePackage.getEStructuralFeature(), null, "domainModelEFeature", null, 1, 1, //$NON-NLS-1$
-			VFeaturePathDomainModelReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeaturePathDomainModelReference_DomainModelEReferencePath(), theEcorePackage.getEReference(),
+		initEReference(getFeaturePathDomainModelReference_DomainModelEFeature(), ecorePackage.getEStructuralFeature(),
+			null, "domainModelEFeature", null, 1, 1, VFeaturePathDomainModelReference.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEReference(getFeaturePathDomainModelReference_DomainModelEReferencePath(), ecorePackage.getEReference(),
 			null, "domainModelEReferencePath", null, 0, -1, VFeaturePathDomainModelReference.class, !IS_TRANSIENT, //$NON-NLS-1$
 			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED,
 			IS_ORDERED);
 
 		initEClass(elementEClass, VElement.class, "Element", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(getElement_Name(), theEcorePackage.getEString(), "name", null, 0, 1, VElement.class, //$NON-NLS-1$
-			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, VElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getElement_Label(), ecorePackage.getEString(), "label", null, 0, 1, VElement.class, IS_TRANSIENT, //$NON-NLS-1$
 			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getElement_Visible(), ecorePackage.getEBoolean(), "visible", "true", 0, 1, VElement.class, //$NON-NLS-1$ //$NON-NLS-2$
 			IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getElement_Enabled(), ecorePackage.getEBoolean(), "enabled", "true", 0, 1, VElement.class, //$NON-NLS-1$ //$NON-NLS-2$
 			IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getElement_Readonly(), theEcorePackage.getEBoolean(), "readonly", "false", 0, 1, VElement.class, //$NON-NLS-1$ //$NON-NLS-2$
+		initEAttribute(getElement_Readonly(), ecorePackage.getEBoolean(), "readonly", "false", 0, 1, VElement.class, //$NON-NLS-1$ //$NON-NLS-2$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getElement_Diagnostic(), getDiagnostic(), null, "diagnostic", null, 0, 1, VElement.class, //$NON-NLS-1$
 			IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
@@ -914,17 +943,17 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 		initEReference(getElement_Attachments(), getAttachment(), null, "attachments", null, 0, -1, VElement.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getElement_Uuid(), theEcorePackage.getEString(), "uuid", null, 0, 1, VElement.class, //$NON-NLS-1$
-			IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getElement_Uuid(), ecorePackage.getEString(), "uuid", null, 0, 1, VElement.class, IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(viewEClass, VView.class, "View", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getView_RootEClass(), theEcorePackage.getEClass(), null, "rootEClass", null, 1, 1, VView.class, //$NON-NLS-1$
+		initEReference(getView_RootEClass(), ecorePackage.getEClass(), null, "rootEClass", null, 1, 1, VView.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 		initEReference(getView_Children(), getContainedElement(), null, "children", null, 0, -1, VView.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getView_EcorePath(), theEcorePackage.getEString(), "ecorePath", null, 1, 1, VView.class, //$NON-NLS-1$
+		initEAttribute(getView_EcorePath(), ecorePackage.getEString(), "ecorePath", null, 1, 1, VView.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getView_LoadingProperties(), getViewModelProperties(), null, "loadingProperties", null, 1, //$NON-NLS-1$
 			1, VView.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
@@ -976,6 +1005,11 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 			0, 1, VDateTimeDisplayAttachment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(hasTooltipEClass, VHasTooltip.class, "HasTooltip", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getHasTooltip_Tooltip(), ecorePackage.getEString(), "tooltip", null, 0, 1, VHasTooltip.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Initialize enums and add enum literals
 		initEEnum(labelAlignmentEEnum, LabelAlignment.class, "LabelAlignment"); //$NON-NLS-1$
 		addEEnumLiteral(labelAlignmentEEnum, LabelAlignment.DEFAULT);
@@ -1015,6 +1049,11 @@ public class VViewPackageImpl extends EPackageImpl implements VViewPackage {
 			new String[] {
 				"constraints", "resolveable" //$NON-NLS-1$ //$NON-NLS-2$
 			});
+		addAnnotation(controlEClass,
+			source,
+			new String[] {
+				"constraints", "resolveable" //$NON-NLS-1$ //$NON-NLS-2$
+			});
 	}
 
 } // ViewPackageImpl
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/reporting/StatusReport.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/reporting/StatusReport.java
index d78d6de344..e61e471392 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/reporting/StatusReport.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/reporting/StatusReport.java
@@ -1,81 +1,81 @@
-/*******************************************************************************

- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Edgar Mueller - initial API and implementation

- ******************************************************************************/

-package org.eclipse.emf.ecp.view.spi.model.reporting;

-

-import org.eclipse.core.runtime.Status;

-import org.eclipse.emfforms.spi.common.report.AbstractReport;

-

-/**

- * A {@link Status} that may be passed to the report service.

- *

- * @author emueller

- * @since 1.5

- */

-public class StatusReport extends AbstractReport {

-

-	private final Status status;

-

-	/**

-	 * Constructor.

-	 *

-	 * @param status

-	 *            the status to be wrapped

-	 */

-	public StatusReport(Status status) {

-		this.status = status;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#getMessage()

-	 */

-	@Override

-	public String getMessage() {

-		return status.getMessage();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#hasException()

-	 */

-	@Override

-	public boolean hasException() {

-		return status.getException() != null;

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#getException()

-	 */

-	@Override

-	public Throwable getException() {

-		return status.getException();

-	}

-

-	/**

-	 *

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#getSeverity()

-	 */

-	@Override

-	public int getSeverity() {

-		return status.getSeverity();

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.model.reporting;
+
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+
+/**
+ * A {@link Status} that may be passed to the report service.
+ *
+ * @author emueller
+ * @since 1.5
+ */
+public class StatusReport extends AbstractReport {
+
+	private final Status status;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param status
+	 *            the status to be wrapped
+	 */
+	public StatusReport(Status status) {
+		this.status = status;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#getMessage()
+	 */
+	@Override
+	public String getMessage() {
+		return status.getMessage();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#hasException()
+	 */
+	@Override
+	public boolean hasException() {
+		return status.getException() != null;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#getException()
+	 */
+	@Override
+	public Throwable getException() {
+		return status.getException();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.common.report.AbstractReport#getSeverity()
+	 */
+	@Override
+	public int getSeverity() {
+		return status.getSeverity();
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceFactoryImpl.java
index 8f0fccd74c..30a23c65a1 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceFactoryImpl.java
@@ -29,7 +29,7 @@ public class VViewResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public VViewResourceFactoryImpl() {
@@ -40,12 +40,12 @@ public class VViewResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Resource createResource(URI uri) {
-		final Resource result = new VViewResourceImpl(uri);
+		Resource result = new VViewResourceImpl(uri);
 		return result;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceImpl.java
index 52d97ec0d4..72a122ebac 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/VViewResourceImpl.java
@@ -28,7 +28,7 @@ public class VViewResourceImpl extends XMIResourceImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param uri the URI of the new resource.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewAdapterFactory.java
index 8c321df839..059a9f369d 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewAdapterFactory.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelProperties;
@@ -161,6 +162,11 @@ public class ViewAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
+		public Adapter caseHasTooltip(VHasTooltip object) {
+			return createHasTooltipAdapter();
+		}
+
+		@Override
 		public Adapter defaultCase(EObject object) {
 			return createEObjectAdapter();
 		}
@@ -181,8 +187,8 @@ public class ViewAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VElement <em>Element</em>
-	 * }'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VElement
+	 * <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -260,8 +266,8 @@ public class ViewAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties <em>Model Loading Properties</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties <em>Model Loading Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -294,15 +300,14 @@ public class ViewAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment <em>Date Time Display Attachment</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment <em>Date Time Display Attachment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * 
+	 *
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.ecp.view.spi.model.VDateTimeDisplayAttachment
 	 * @generated
@@ -312,6 +317,23 @@ public class ViewAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip <em>Has
+	 * Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip
+	 * @generated
+	 * @since 1.13
+	 */
+	public Adapter createHasTooltipAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Object Map Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
@@ -377,9 +399,9 @@ public class ViewAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference
-	 * <em>Feature Path Domain Model Reference</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference <em>Feature Path Domain Model
+	 * Reference</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewSwitch.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewSwitch.java
index c8974e2070..0dfa70440f 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewSwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewSwitch.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelProperties;
@@ -236,6 +237,14 @@ public class ViewSwitch<T> extends Switch<T> {
 			}
 			return result;
 		}
+		case VViewPackage.HAS_TOOLTIP: {
+			final VHasTooltip hasTooltip = (VHasTooltip) theEObject;
+			T result = caseHasTooltip(hasTooltip);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
 		default:
 			return defaultCase(theEObject);
 		}
@@ -410,10 +419,9 @@ public class ViewSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
-	 * 
+	 *
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Date Time Display Attachment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -424,6 +432,23 @@ public class ViewSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 * @since 1.13
+	 */
+	public T caseHasTooltip(VHasTooltip object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Domain Model Reference</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java
index 03e96b8551..405eecfa39 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java
@@ -37,6 +37,7 @@ import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelLoadingProperties;
 import org.eclipse.emf.ecp.view.spi.model.VViewModelProperties;
@@ -157,6 +158,8 @@ public class ViewValidator extends EObjectValidator {
 			return validateViewModelProperties((VViewModelProperties) value, diagnostics, context);
 		case VViewPackage.DATE_TIME_DISPLAY_ATTACHMENT:
 			return validateDateTimeDisplayAttachment((VDateTimeDisplayAttachment) value, diagnostics, context);
+		case VViewPackage.HAS_TOOLTIP:
+			return validateHasTooltip((VHasTooltip) value, diagnostics, context);
 		case VViewPackage.LABEL_ALIGNMENT:
 			return validateLabelAlignment((LabelAlignment) value, diagnostics, context);
 		case VViewPackage.DATE_TIME_DISPLAY_TYPE:
@@ -499,12 +502,14 @@ public class ViewValidator extends EObjectValidator {
 		}
 		return validateDomainModelReference(domainModelReference, diagnostics, context);
 	}
+	// end of custom code
 
 	/**
-	 * @generated
-	 * 			<!-- begin-user-doc -->
+	 * <!-- begin-user-doc -->
+	 *
 	 * @since 1.7
 	 *        <!-- end-user-doc -->
+	 * @generated
 	 */
 	public boolean validateViewModelLoadingProperties(VViewModelLoadingProperties viewModelLoadingProperties,
 		DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -540,7 +545,6 @@ public class ViewValidator extends EObjectValidator {
 	 *
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public boolean validateDateTimeDisplayAttachment(VDateTimeDisplayAttachment dateTimeDisplayAttachment,
@@ -553,6 +557,18 @@ public class ViewValidator extends EObjectValidator {
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
+	 * @since 1.13
+	 */
+	public boolean validateHasTooltip(VHasTooltip hasTooltip, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(hasTooltip, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
 	 */
 	public boolean validateLabelAlignment(LabelAlignment labelAlignment, DiagnosticChain diagnostics,
 		Map<Object, Object> context) {
@@ -564,7 +580,6 @@ public class ViewValidator extends EObjectValidator {
 	 *
 	 * @since 1.8
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public boolean validateDateTimeDisplayType(DateTimeDisplayType dateTimeDisplayType, DiagnosticChain diagnostics,
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
index 6178f78781..d98b502a3e 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rule Model Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.rule.model.provider.RuleEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.rule.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml
index 0c143154de..d7b557d288 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.rule.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
index 343aa27806..a6409aefc7 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rule Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.rule.model.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.rule.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml
index 1a800c8308..34a79c0def 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.rule.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
index fbdf7b85df..d390744c50 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.rule.test,org.eclipse.emf.ecp.view.model.integrationtest,org.eclipse.emf.ecp.view.unset.test",
- org.eclipse.emf.ecp.view.spi.rule;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.rule.test,org.eclipse.emf.ecp.view.model.integrationtest,org.eclipse.emf.ecp.view.unset.test",
+ org.eclipse.emf.ecp.view.spi.rule;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="1.2.0"
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.AndConditionService.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
index 49eb28e284..6b6cd9c6ee 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.rule</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
index 5543641d61..97561ed388 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.section.model.provider.SectionEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.section.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml
index d27b4aac27..cc5527a0e5 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionEditPlugin.java b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionEditPlugin.java
index e75e04f98e..6bacf97a8c 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionEditPlugin.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionEditPlugin.java
@@ -13,7 +13,6 @@ package org.eclipse.emf.ecp.view.spi.section.model.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 import org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin;
 
 /**
@@ -42,13 +41,11 @@ public final class SectionEditPlugin extends EMFPlugin {
 	/**
 	 * Create the instance.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public SectionEditPlugin() {
-		super(new ResourceLocator[]
-		{
-			EcoreEditPlugin.INSTANCE,
+		super(new ResourceLocator[] {
 			ViewEditPlugin.INSTANCE,
 		});
 	}
@@ -57,7 +54,7 @@ public final class SectionEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -70,7 +67,7 @@ public final class SectionEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -88,7 +85,7 @@ public final class SectionEditPlugin extends EMFPlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProvider.java b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProvider.java
index 7c7e06b81c..772aa6edb1 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProvider.java
@@ -54,27 +54,50 @@ public class SectionItemProvider extends ContainerItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addTooltipPropertyDescriptor(object);
 			addCollapsedPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Tooltip feature.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addTooltipPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_HasTooltip_tooltip_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_HasTooltip_tooltip_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_HasTooltip_type"), //$NON-NLS-1$
+				VViewPackage.Literals.HAS_TOOLTIP__TOOLTIP,
+				true,
+				true,
+				false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
 	 * This adds a property descriptor for the Collapsed feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
 	 */
-	protected void addCollapsedPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addCollapsedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Section_collapsed_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Section_collapsed_feature", "_UI_Section_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -98,8 +121,7 @@ public class SectionItemProvider extends ContainerItemProvider {
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(
 		Object object) {
-		if (childrenFeatures == null)
-		{
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(VSectionPackage.Literals.SECTION__CHILD_ITEMS);
 		}
@@ -143,8 +165,7 @@ public class SectionItemProvider extends ContainerItemProvider {
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_Section_type") : //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_Section_type") : //$NON-NLS-1$
 			getString("_UI_Section_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -160,8 +181,8 @@ public class SectionItemProvider extends ContainerItemProvider {
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VSection.class))
-		{
+		switch (notification.getFeatureID(VSection.class)) {
+		case VSectionPackage.SECTION__TOOLTIP:
 		case VSectionPackage.SECTION__COLLAPSED:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -184,15 +205,11 @@ public class SectionItemProvider extends ContainerItemProvider {
 		Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VViewPackage.Literals.CONTAINER__CHILDREN,
-				VSectionFactory.eINSTANCE.createSectionedArea()));
+		newChildDescriptors.add(createChildParameter(VViewPackage.Literals.CONTAINER__CHILDREN,
+			VSectionFactory.eINSTANCE.createSectionedArea()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VSectionPackage.Literals.SECTION__CHILD_ITEMS,
-				VSectionFactory.eINSTANCE.createSection()));
+		newChildDescriptors.add(createChildParameter(VSectionPackage.Literals.SECTION__CHILD_ITEMS,
+			VSectionFactory.eINSTANCE.createSection()));
 	}
 
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProviderAdapterFactory.java
index 8bd24a3316..381fb2c202 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionItemProviderAdapterFactory.java
@@ -51,7 +51,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
- *
+ * 
  * @generated
  */
 public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
@@ -60,7 +60,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -77,7 +77,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	 * This helps manage the child creation extenders.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
@@ -111,7 +111,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	 * {@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected SectionedAreaItemProvider sectionedAreaItemProvider;
@@ -120,14 +120,12 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createSectionedAreaAdapter()
-	{
-		if (sectionedAreaItemProvider == null)
-		{
+	public Adapter createSectionedAreaAdapter() {
+		if (sectionedAreaItemProvider == null) {
 			sectionedAreaItemProvider = new SectionedAreaItemProvider(this);
 		}
 
@@ -138,7 +136,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.ecp.view.spi.section.model.VSection}
 	 * instances.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected SectionItemProvider sectionItemProvider;
@@ -151,8 +149,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	 */
 	@Override
 	public Adapter createSectionAdapter() {
-		if (sectionItemProvider == null)
-		{
+		if (sectionItemProvider == null) {
 			sectionItemProvider = new SectionItemProvider(this);
 		}
 
@@ -184,7 +181,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -195,7 +192,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	/**
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -205,16 +202,14 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type))
-		{
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
-			{
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -224,7 +219,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public List<IChildCreationExtender> getChildCreationExtenders() {
@@ -233,7 +228,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -244,7 +239,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -255,7 +250,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	/**
 	 * This adds a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +261,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	/**
 	 * This removes a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -285,8 +280,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null)
-		{
+		if (parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -299,12 +293,10 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 	 */
 	@Override
 	public void dispose() {
-		if (sectionedAreaItemProvider != null) {
+		if (sectionedAreaItemProvider != null)
 			sectionedAreaItemProvider.dispose();
-		}
-		if (sectionItemProvider != null) {
+		if (sectionItemProvider != null)
 			sectionItemProvider.dispose();
-		}
 	}
 
 	/**
@@ -318,7 +310,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		protected static class CreationSwitch extends ViewSwitch<Object> {
@@ -326,7 +318,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 			 * The child descriptors being populated.
 			 * <!-- begin-user-doc -->
 			 * <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			protected List<Object> newChildDescriptors;
@@ -335,7 +327,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 			 * The domain in which to create the children.
 			 * <!-- begin-user-doc
 			 * --> <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			protected EditingDomain editingDomain;
@@ -343,7 +335,7 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 			/**
 			 * Creates the a switch for populating child descriptors in the given domain.
 			 * <!-- begin-user-doc --> <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			CreationSwitch(List<Object> newChildDescriptors,
@@ -354,37 +346,33 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 
 			/**
 			 * <!-- begin-user-doc --> <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			@Override
 			public Object caseView(VView object) {
-				newChildDescriptors.add
-					(createChildParameter
-					(VViewPackage.Literals.VIEW__CHILDREN,
-						VSectionFactory.eINSTANCE.createSectionedArea()));
+				newChildDescriptors.add(createChildParameter(VViewPackage.Literals.VIEW__CHILDREN,
+					VSectionFactory.eINSTANCE.createSectionedArea()));
 
 				return null;
 			}
 
 			/**
 			 * <!-- begin-user-doc --> <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			@Override
 			public Object caseContainer(VContainer object) {
-				newChildDescriptors.add
-					(createChildParameter
-					(VViewPackage.Literals.CONTAINER__CHILDREN,
-						VSectionFactory.eINSTANCE.createSectionedArea()));
+				newChildDescriptors.add(createChildParameter(VViewPackage.Literals.CONTAINER__CHILDREN,
+					VSectionFactory.eINSTANCE.createSectionedArea()));
 
 				return null;
 			}
 
 			/**
 			 * <!-- begin-user-doc --> <!-- end-user-doc -->
-			 *
+			 * 
 			 * @generated
 			 */
 			protected CommandParameter createChildParameter(Object feature,
@@ -396,20 +384,20 @@ public class SectionItemProviderAdapterFactory extends SectionAdapterFactory
 
 		/**
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
 		public Collection<Object> getNewChildDescriptors(Object object,
 			EditingDomain editingDomain) {
-			final ArrayList<Object> result = new ArrayList<Object>();
+			ArrayList<Object> result = new ArrayList<Object>();
 			new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
 			return result;
 		}
 
 		/**
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionedAreaItemProvider.java b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionedAreaItemProvider.java
index e50da74dfe..f4c3ba1509 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionedAreaItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/src/org/eclipse/emf/ecp/view/spi/section/model/provider/SectionedAreaItemProvider.java
@@ -30,20 +30,18 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class SectionedAreaItemProvider extends ContainedElementItemProvider
-{
+public class SectionedAreaItemProvider extends ContainedElementItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public SectionedAreaItemProvider(AdapterFactory adapterFactory)
-	{
+	public SectionedAreaItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -51,14 +49,12 @@ public class SectionedAreaItemProvider extends ContainedElementItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -71,14 +67,12 @@ public class SectionedAreaItemProvider extends ContainedElementItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(VSectionPackage.Literals.SECTIONED_AREA__ROOT);
 		}
@@ -88,12 +82,11 @@ public class SectionedAreaItemProvider extends ContainedElementItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -104,12 +97,11 @@ public class SectionedAreaItemProvider extends ContainedElementItemProvider
 	 * This returns SectionedArea.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/SectionedArea")); //$NON-NLS-1$
 	}
 
@@ -121,14 +113,12 @@ public class SectionedAreaItemProvider extends ContainedElementItemProvider
 	 * @generated NOT
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		String label = ((VSectionedArea) object).getName();
 		if (label == null) {
 			label = VElementUtil.getCleanName(VElement.class.cast(object));
 		}
-		return label == null || label.length() == 0 ?
-			getString("_UI_SectionedArea_type") : //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_SectionedArea_type") : //$NON-NLS-1$
 			getString("_UI_SectionedArea_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -137,16 +127,14 @@ public class SectionedAreaItemProvider extends ContainedElementItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(VSectionedArea.class))
-		{
+		switch (notification.getFeatureID(VSectionedArea.class)) {
 		case VSectionPackage.SECTIONED_AREA__ROOT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -159,18 +147,15 @@ public class SectionedAreaItemProvider extends ContainedElementItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(VSectionPackage.Literals.SECTIONED_AREA__ROOT,
-				VSectionFactory.eINSTANCE.createSection()));
+		newChildDescriptors.add(createChildParameter(VSectionPackage.Literals.SECTIONED_AREA__ROOT,
+			VSectionFactory.eINSTANCE.createSection()));
 	}
 
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.section.model/.settings/.api_filters
index 8b9b6b4480..6a5818acef 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/.settings/.api_filters
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.emf.ecp.view.section.model" version="2">
     <resource path="META-INF/MANIFEST.MF">
+        <filter comment="SPI Changes for 1.13" id="923795461">
+            <message_arguments>
+                <message_argument value="1.13.0"/>
+                <message_argument value="1.12.0"/>
+            </message_arguments>
+        </filter>
         <filter comment="This is SPI" id="923795461">
             <message_arguments>
                 <message_argument value="1.3.0"/>
@@ -133,6 +139,13 @@
                 <message_argument value="10"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTION_FEATURE_COUNT"/>
+                <message_argument value="11"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
@@ -175,6 +188,20 @@
                 <message_argument value="8"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTION__CHILD_ITEMS"/>
+                <message_argument value="9"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTION__COLLAPSED"/>
+                <message_argument value="10"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
@@ -217,5 +244,35 @@
                 <message_argument value="1"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTIONED_AREA__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTIONED_AREA__UUID"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTION__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTION__TOOLTIP"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage"/>
+                <message_argument value="SECTION__UUID"/>
+            </message_arguments>
+        </filter>
     </resource>
 </component>
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
index 81bf4863fc..9ca702d7b3 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.section.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.section.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/model/section.ecore b/bundles/org.eclipse.emf.ecp.view.section.model/model/section.ecore
index 14775aa97c..aa90c3524f 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/model/section.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/model/section.ecore
@@ -6,7 +6,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="#//Section"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Section" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Container">
+  <eClassifiers xsi:type="ecore:EClass" name="Section" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Container ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//HasTooltip">
     <eStructuralFeatures xsi:type="ecore:EReference" name="childItems" upperBound="-1"
         eType="#//Section" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/model/section.genmodel b/bundles/org.eclipse.emf.ecp.view.section.model/model/section.genmodel
index c77aebd236..1ee9b06c8b 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/model/section.genmodel
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/model/section.genmodel
@@ -7,7 +7,7 @@
     nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" commentFormatting="true" testSuiteClass="org.eclipse.emf.ecp.view.spi.section.model.tests.SectionAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    providerRootExtendsClass="" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
+    providerRootExtendsClass="" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
     interfaceNamePattern="V{0}" classNamePattern="V{0}Impl" importOrganizing="true">
   <foreignModel>section.ecore</foreignModel>
   <genPackages prefix="Section" basePackage="org.eclipse.emf.ecp.view.spi" disposableProviderFactory="true"
@@ -15,12 +15,12 @@
       utilityPackageSuffix="model.util" providerPackageSuffix="model.provider" presentationPackageSuffix="model.presentation"
       testsPackageSuffix="model.tests" extensibleProviderFactory="true" childCreationExtenders="true"
       ecorePackage="section.ecore#/">
-    <genClasses ecoreClass="section.ecore#//Section">
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference section.ecore#//Section/root"/>
+    <genClasses ecoreClass="section.ecore#//SectionedArea">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference section.ecore#//SectionedArea/root"/>
     </genClasses>
-    <genClasses ecoreClass="section.ecore#//SectionItem"/>
-    <genClasses ecoreClass="section.ecore#//SectionNode">
-      <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference section.ecore#//SectionNode/childItems"/>
+    <genClasses ecoreClass="section.ecore#//Section">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference section.ecore#//Section/childItems"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute section.ecore#//Section/collapsed"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml
index 4e366bc961..07da232193 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSection.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSection.java
index 77355a5207..215b4f9cba 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSection.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSection.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.ecp.view.spi.section.model;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecp.view.spi.model.VContainer;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 
 /**
  * <!-- begin-user-doc -->
@@ -21,18 +22,17 @@ import org.eclipse.emf.ecp.view.spi.model.VContainer;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.section.model.VSection#getChildItems <em>Child Items</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.section.model.VSection#isCollapsed <em>Collapsed</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage#getSection()
  * @model
  * @generated
  */
-public interface VSection extends VContainer
-{
+public interface VSection extends VContainer, VHasTooltip {
 	/**
 	 * Returns the value of the '<em><b>Child Items</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.ecp.view.spi.section.model.VSection}.
@@ -42,7 +42,7 @@ public interface VSection extends VContainer
 	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Child Items</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage#getSection_ChildItems()
 	 * @model containment="true"
@@ -59,7 +59,7 @@ public interface VSection extends VContainer
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Collapsed</em>' attribute.
 	 * @see #setCollapsed(boolean)
 	 * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage#getSection_Collapsed()
@@ -69,11 +69,11 @@ public interface VSection extends VContainer
 	boolean isCollapsed();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.section.model.VSection#isCollapsed <em>Collapsed</em>}
-	 * ' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.section.model.VSection#isCollapsed
+	 * <em>Collapsed</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Collapsed</em>' attribute.
 	 * @see #isCollapsed()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionFactory.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionFactory.java
index dd7d654b14..f2d0ad0ba9 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionFactory.java
@@ -18,17 +18,16 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage
  * @generated
  */
-public interface VSectionFactory extends EFactory
-{
+public interface VSectionFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	VSectionFactory eINSTANCE = org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionFactoryImpl.init();
@@ -37,7 +36,7 @@ public interface VSectionFactory extends EFactory
 	 * Returns a new object of class '<em>Sectioned Area</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Sectioned Area</em>'.
 	 * @generated
 	 */
@@ -47,7 +46,7 @@ public interface VSectionFactory extends EFactory
 	 * Returns a new object of class '<em>Section</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Section</em>'.
 	 * @generated
 	 */
@@ -57,7 +56,7 @@ public interface VSectionFactory extends EFactory
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionPackage.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionPackage.java
index a84e5ccd0f..72d27a3805 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionPackage.java
@@ -33,8 +33,7 @@ import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
  * @model kind="package"
  * @generated
  */
-public interface VSectionPackage extends EPackage
-{
+public interface VSectionPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
@@ -94,6 +93,18 @@ public interface VSectionPackage extends EPackage
 	int SECTIONED_AREA__NAME = VViewPackage.CONTAINED_ELEMENT__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SECTIONED_AREA__LABEL = VViewPackage.CONTAINED_ELEMENT__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -144,6 +155,18 @@ public interface VSectionPackage extends EPackage
 	int SECTIONED_AREA__ATTACHMENTS = VViewPackage.CONTAINED_ELEMENT__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SECTIONED_AREA__UUID = VViewPackage.CONTAINED_ELEMENT__UUID;
+
+	/**
 	 * The feature id for the '<em><b>Root</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -164,8 +187,8 @@ public interface VSectionPackage extends EPackage
 	int SECTIONED_AREA_FEATURE_COUNT = VViewPackage.CONTAINED_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionImpl <em>Section</em>}
-	 * ' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionImpl
+	 * <em>Section</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -186,6 +209,18 @@ public interface VSectionPackage extends EPackage
 	int SECTION__NAME = VViewPackage.CONTAINER__NAME;
 
 	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SECTION__LABEL = VViewPackage.CONTAINER__LABEL;
+
+	/**
 	 * The feature id for the '<em><b>Visible</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -236,6 +271,18 @@ public interface VSectionPackage extends EPackage
 	int SECTION__ATTACHMENTS = VViewPackage.CONTAINER__ATTACHMENTS;
 
 	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SECTION__UUID = VViewPackage.CONTAINER__UUID;
+
+	/**
 	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -246,6 +293,18 @@ public interface VSectionPackage extends EPackage
 	int SECTION__CHILDREN = VViewPackage.CONTAINER__CHILDREN;
 
 	/**
+	 * The feature id for the '<em><b>Tooltip</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int SECTION__TOOLTIP = VViewPackage.CONTAINER_FEATURE_COUNT + 0;
+
+	/**
 	 * The feature id for the '<em><b>Child Items</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -253,7 +312,7 @@ public interface VSectionPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int SECTION__CHILD_ITEMS = VViewPackage.CONTAINER_FEATURE_COUNT + 0;
+	int SECTION__CHILD_ITEMS = VViewPackage.CONTAINER_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Collapsed</b></em>' attribute.
@@ -263,7 +322,7 @@ public interface VSectionPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int SECTION__COLLAPSED = VViewPackage.CONTAINER_FEATURE_COUNT + 1;
+	int SECTION__COLLAPSED = VViewPackage.CONTAINER_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Section</em>' class.
@@ -273,11 +332,11 @@ public interface VSectionPackage extends EPackage
 	 * @generated
 	 * @ordered
 	 */
-	int SECTION_FEATURE_COUNT = VViewPackage.CONTAINER_FEATURE_COUNT + 2;
+	int SECTION_FEATURE_COUNT = VViewPackage.CONTAINER_FEATURE_COUNT + 3;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea
-	 * <em>Sectioned Area</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea <em>Sectioned
+	 * Area</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -288,8 +347,8 @@ public interface VSectionPackage extends EPackage
 	EClass getSectionedArea();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea#getRoot <em>Root</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea#getRoot <em>Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -312,8 +371,8 @@ public interface VSectionPackage extends EPackage
 	EClass getSection();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.spi.section.model.VSection#getChildItems <em>Child Items</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.spi.section.model.VSection#getChildItems <em>Child Items</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -325,8 +384,8 @@ public interface VSectionPackage extends EPackage
 	EReference getSection_ChildItems();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.spi.section.model.VSection#isCollapsed <em>Collapsed</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.spi.section.model.VSection#isCollapsed
+	 * <em>Collapsed</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -360,8 +419,7 @@ public interface VSectionPackage extends EPackage
 	 *
 	 * @generated
 	 */
-	interface Literals
-	{
+	interface Literals {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionedAreaImpl
 		 * <em>Sectioned Area</em>}' class.
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionedArea.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionedArea.java
index caa31eed80..4f01a03b3e 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionedArea.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/VSectionedArea.java
@@ -20,17 +20,16 @@ import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea#getRoot <em>Root</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage#getSectionedArea()
  * @model
  * @generated
  */
-public interface VSectionedArea extends VContainedElement
-{
+public interface VSectionedArea extends VContainedElement {
 	/**
 	 * Returns the value of the '<em><b>Root</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
@@ -39,7 +38,7 @@ public interface VSectionedArea extends VContainedElement
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Root</em>' containment reference.
 	 * @see #setRoot(VSection)
 	 * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage#getSectionedArea_Root()
@@ -53,7 +52,7 @@ public interface VSectionedArea extends VContainedElement
 	 * containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Root</em>' containment reference.
 	 * @see #getRoot()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionFactoryImpl.java
index 3885004d68..19c58f00a2 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionFactoryImpl.java
@@ -25,30 +25,25 @@ import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class VSectionFactoryImpl extends EFactoryImpl implements VSectionFactory
-{
+public class VSectionFactoryImpl extends EFactoryImpl implements VSectionFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static VSectionFactory init()
-	{
-		try
-		{
-			final VSectionFactory theSectionFactory = (VSectionFactory) EPackage.Registry.INSTANCE
+	public static VSectionFactory init() {
+		try {
+			VSectionFactory theSectionFactory = (VSectionFactory) EPackage.Registry.INSTANCE
 				.getEFactory(VSectionPackage.eNS_URI);
-			if (theSectionFactory != null)
-			{
+			if (theSectionFactory != null) {
 				return theSectionFactory;
 			}
-		} catch (final Exception exception)
-		{
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new VSectionFactoryImpl();
@@ -58,25 +53,22 @@ public class VSectionFactoryImpl extends EFactoryImpl implements VSectionFactory
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public VSectionFactoryImpl()
-	{
+	public VSectionFactoryImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EObject create(EClass eClass)
-	{
-		switch (eClass.getClassifierID())
-		{
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
 		case VSectionPackage.SECTIONED_AREA:
 			return createSectionedArea();
 		case VSectionPackage.SECTION:
@@ -89,51 +81,47 @@ public class VSectionFactoryImpl extends EFactoryImpl implements VSectionFactory
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VSectionedArea createSectionedArea()
-	{
-		final VSectionedAreaImpl sectionedArea = new VSectionedAreaImpl();
+	public VSectionedArea createSectionedArea() {
+		VSectionedAreaImpl sectionedArea = new VSectionedAreaImpl();
 		return sectionedArea;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VSection createSection()
-	{
-		final VSectionImpl section = new VSectionImpl();
+	public VSection createSection() {
+		VSectionImpl section = new VSectionImpl();
 		return section;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VSectionPackage getSectionPackage()
-	{
+	public VSectionPackage getSectionPackage() {
 		return (VSectionPackage) getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
 	@Deprecated
-	public static VSectionPackage getPackage()
-	{
+	public static VSectionPackage getPackage() {
 		return VSectionPackage.eINSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionImpl.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionImpl.java
index 9b1b3894c0..70562d47bb 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionImpl.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.model.impl.VContainerImpl;
 import org.eclipse.emf.ecp.view.spi.section.model.VSection;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage;
@@ -31,16 +33,38 @@ import org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionImpl#getTooltip <em>Tooltip</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionImpl#getChildItems <em>Child Items</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionImpl#isCollapsed <em>Collapsed</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class VSectionImpl extends VContainerImpl implements VSection
-{
+public class VSectionImpl extends VContainerImpl implements VSection {
+	/**
+	 * The default value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 * @since 1.13
+	 */
+	protected static final String TOOLTIP_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getTooltip() <em>Tooltip</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTooltip()
+	 * @generated
+	 * @ordered
+	 * @since 1.13
+	 */
+	protected String tooltip = TOOLTIP_EDEFAULT;
 	/**
 	 * The cached value of the '{@link #getChildItems() <em>Child Items</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
@@ -78,8 +102,7 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 *
 	 * @generated
 	 */
-	protected VSectionImpl()
-	{
+	protected VSectionImpl() {
 		super();
 	}
 
@@ -90,8 +113,7 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VSectionPackage.Literals.SECTION;
 	}
 
@@ -100,12 +122,39 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
+	 * @since 1.13
+	 */
+	@Override
+	public String getTooltip() {
+		return tooltip;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @since 1.13
+	 */
+	@Override
+	public void setTooltip(String newTooltip) {
+		final String oldTooltip = tooltip;
+		tooltip = newTooltip;
+		if (eNotificationRequired()) {
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, VSectionPackage.SECTION__TOOLTIP, oldTooltip, tooltip));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
 	 */
 	@Override
-	public EList<VSection> getChildItems()
-	{
-		if (childItems == null)
-		{
+	public EList<VSection> getChildItems() {
+		if (childItems == null) {
 			childItems = new EObjectContainmentEList<VSection>(VSection.class, this,
 				VSectionPackage.SECTION__CHILD_ITEMS);
 		}
@@ -119,8 +168,7 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	public boolean isCollapsed()
-	{
+	public boolean isCollapsed() {
 		return collapsed;
 	}
 
@@ -131,8 +179,7 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	public void setCollapsed(boolean newCollapsed)
-	{
+	public void setCollapsed(boolean newCollapsed) {
 		final boolean oldCollapsed = collapsed;
 		collapsed = newCollapsed;
 		if (eNotificationRequired()) {
@@ -148,10 +195,8 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case VSectionPackage.SECTION__CHILD_ITEMS:
 			return ((InternalEList<?>) getChildItems()).basicRemove(otherEnd, msgs);
 		}
@@ -165,10 +210,10 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case VSectionPackage.SECTION__TOOLTIP:
+			return getTooltip();
 		case VSectionPackage.SECTION__CHILD_ITEMS:
 			return getChildItems();
 		case VSectionPackage.SECTION__COLLAPSED:
@@ -185,10 +230,11 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case VSectionPackage.SECTION__TOOLTIP:
+			setTooltip((String) newValue);
+			return;
 		case VSectionPackage.SECTION__CHILD_ITEMS:
 			getChildItems().clear();
 			getChildItems().addAll((Collection<? extends VSection>) newValue);
@@ -207,10 +253,11 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case VSectionPackage.SECTION__TOOLTIP:
+			setTooltip(TOOLTIP_EDEFAULT);
+			return;
 		case VSectionPackage.SECTION__CHILD_ITEMS:
 			getChildItems().clear();
 			return;
@@ -228,10 +275,10 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case VSectionPackage.SECTION__TOOLTIP:
+			return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
 		case VSectionPackage.SECTION__CHILD_ITEMS:
 			return childItems != null && !childItems.isEmpty();
 		case VSectionPackage.SECTION__COLLAPSED:
@@ -247,14 +294,53 @@ public class VSectionImpl extends VContainerImpl implements VSection
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == VHasTooltip.class) {
+			switch (derivedFeatureID) {
+			case VSectionPackage.SECTION__TOOLTIP:
+				return VViewPackage.HAS_TOOLTIP__TOOLTIP;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == VHasTooltip.class) {
+			switch (baseFeatureID) {
+			case VViewPackage.HAS_TOOLTIP__TOOLTIP:
+				return VSectionPackage.SECTION__TOOLTIP;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
 		if (eIsProxy()) {
 			return super.toString();
 		}
 
 		final StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (collapsed: "); //$NON-NLS-1$
+		result.append(" (tooltip: "); //$NON-NLS-1$
+		result.append(tooltip);
+		result.append(", collapsed: "); //$NON-NLS-1$
 		result.append(collapsed);
 		result.append(')');
 		return result.toString();
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionPackageImpl.java
index c25a08d8a0..aada29ab79 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionPackageImpl.java
@@ -26,15 +26,14 @@ import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
-{
+public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass sectionedAreaEClass = null;
@@ -42,7 +41,7 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass sectionEClass = null;
@@ -61,42 +60,40 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 	 * @see #init()
 	 * @generated
 	 */
-	private VSectionPackageImpl()
-	{
+	private VSectionPackageImpl() {
 		super(eNS_URI, VSectionFactory.eINSTANCE);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * 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 VSectionPackage#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
+	 * This method is used to initialize {@link VSectionPackage#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
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static VSectionPackage init()
-	{
-		if (isInited) {
+	public static VSectionPackage init() {
+		if (isInited)
 			return (VSectionPackage) EPackage.Registry.INSTANCE.getEPackage(VSectionPackage.eNS_URI);
-		}
 
 		// Obtain or create and register package
-		final VSectionPackageImpl theSectionPackage = (VSectionPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof VSectionPackageImpl ? EPackage.Registry.INSTANCE
-			.get(eNS_URI)
-			: new VSectionPackageImpl());
+		VSectionPackageImpl theSectionPackage = (VSectionPackageImpl) (EPackage.Registry.INSTANCE
+			.get(eNS_URI) instanceof VSectionPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new VSectionPackageImpl());
 
 		isInited = true;
 
@@ -120,79 +117,73 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getSectionedArea()
-	{
+	public EClass getSectionedArea() {
 		return sectionedAreaEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getSectionedArea_Root()
-	{
+	public EReference getSectionedArea_Root() {
 		return (EReference) sectionedAreaEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EClass getSection()
-	{
+	public EClass getSection() {
 		return sectionEClass;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EReference getSection_ChildItems()
-	{
+	public EReference getSection_ChildItems() {
 		return (EReference) sectionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public EAttribute getSection_Collapsed()
-	{
+	public EAttribute getSection_Collapsed() {
 		return (EAttribute) sectionEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VSectionFactory getSectionFactory()
-	{
+	public VSectionFactory getSectionFactory() {
 		return (VSectionFactory) getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -202,14 +193,12 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void createPackageContents()
-	{
-		if (isCreated) {
+	public void createPackageContents() {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -224,7 +213,7 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -234,14 +223,12 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void initializePackageContents()
-	{
-		if (isInitialized) {
+	public void initializePackageContents() {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -250,7 +237,7 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		final VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
+		VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -259,26 +246,21 @@ public class VSectionPackageImpl extends EPackageImpl implements VSectionPackage
 		// Add supertypes to classes
 		sectionedAreaEClass.getESuperTypes().add(theViewPackage.getContainedElement());
 		sectionEClass.getESuperTypes().add(theViewPackage.getContainer());
+		sectionEClass.getESuperTypes().add(theViewPackage.getHasTooltip());
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(sectionedAreaEClass, VSectionedArea.class,
-			"SectionedArea", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getSectionedArea_Root(),
-			getSection(),
-			null,
-			"root", null, 1, 1, VSectionedArea.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(sectionedAreaEClass, VSectionedArea.class, "SectionedArea", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSectionedArea_Root(), this.getSection(), null, "root", null, 1, 1, VSectionedArea.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		initEClass(sectionEClass, VSection.class, "Section", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getSection_ChildItems(),
-			getSection(),
-			null,
-			"childItems", null, 0, -1, VSection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getSection_Collapsed(),
-			ecorePackage.getEBoolean(),
-			"collapsed", "false", 0, 1, VSection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEReference(getSection_ChildItems(), this.getSection(), null, "childItems", null, 0, -1, VSection.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getSection_Collapsed(), ecorePackage.getEBoolean(), "collapsed", "false", 0, 1, VSection.class, //$NON-NLS-1$ //$NON-NLS-2$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionedAreaImpl.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionedAreaImpl.java
index 6018b47ebc..e12b36526e 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionedAreaImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/impl/VSectionedAreaImpl.java
@@ -27,20 +27,19 @@ import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.section.model.impl.VSectionedAreaImpl#getRoot <em>Root</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class VSectionedAreaImpl extends VContainedElementImpl implements VSectionedArea
-{
+public class VSectionedAreaImpl extends VContainedElementImpl implements VSectionedArea {
 	/**
 	 * The cached value of the '{@link #getRoot() <em>Root</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getRoot()
 	 * @generated
 	 * @ordered
@@ -50,57 +49,51 @@ public class VSectionedAreaImpl extends VContainedElementImpl implements VSectio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected VSectionedAreaImpl()
-	{
+	protected VSectionedAreaImpl() {
 		super();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return VSectionPackage.Literals.SECTIONED_AREA;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public VSection getRoot()
-	{
+	public VSection getRoot() {
 		return root;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetRoot(VSection newRoot, NotificationChain msgs)
-	{
-		final VSection oldRoot = root;
+	public NotificationChain basicSetRoot(VSection newRoot, NotificationChain msgs) {
+		VSection oldRoot = root;
 		root = newRoot;
-		if (eNotificationRequired())
-		{
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				VSectionPackage.SECTIONED_AREA__ROOT, oldRoot, newRoot);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -108,45 +101,36 @@ public class VSectionedAreaImpl extends VContainedElementImpl implements VSectio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void setRoot(VSection newRoot)
-	{
-		if (newRoot != root)
-		{
+	public void setRoot(VSection newRoot) {
+		if (newRoot != root) {
 			NotificationChain msgs = null;
-			if (root != null) {
-				msgs = ((InternalEObject) root).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- VSectionPackage.SECTIONED_AREA__ROOT, null, msgs);
-			}
-			if (newRoot != null) {
-				msgs = ((InternalEObject) newRoot).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- VSectionPackage.SECTIONED_AREA__ROOT, null, msgs);
-			}
+			if (root != null)
+				msgs = ((InternalEObject) root).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - VSectionPackage.SECTIONED_AREA__ROOT, null, msgs);
+			if (newRoot != null)
+				msgs = ((InternalEObject) newRoot).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - VSectionPackage.SECTIONED_AREA__ROOT, null, msgs);
 			msgs = basicSetRoot(newRoot, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, VSectionPackage.SECTIONED_AREA__ROOT, newRoot,
-				newRoot));
-		}
+		} else if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, VSectionPackage.SECTIONED_AREA__ROOT, newRoot, newRoot));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case VSectionPackage.SECTIONED_AREA__ROOT:
 			return basicSetRoot(null, msgs);
 		}
@@ -156,14 +140,12 @@ public class VSectionedAreaImpl extends VContainedElementImpl implements VSectio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case VSectionPackage.SECTIONED_AREA__ROOT:
 			return getRoot();
 		}
@@ -173,14 +155,12 @@ public class VSectionedAreaImpl extends VContainedElementImpl implements VSectio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case VSectionPackage.SECTIONED_AREA__ROOT:
 			setRoot((VSection) newValue);
 			return;
@@ -191,14 +171,12 @@ public class VSectionedAreaImpl extends VContainedElementImpl implements VSectio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case VSectionPackage.SECTIONED_AREA__ROOT:
 			setRoot((VSection) null);
 			return;
@@ -209,14 +187,12 @@ public class VSectionedAreaImpl extends VContainedElementImpl implements VSectio
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case VSectionPackage.SECTIONED_AREA__ROOT:
 			return root != null;
 		}
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionAdapterFactory.java
index a7af71b0ca..5a5e863f1e 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionAdapterFactory.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
 import org.eclipse.emf.ecp.view.spi.model.VContainer;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 import org.eclipse.emf.ecp.view.spi.section.model.VSection;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
@@ -31,8 +32,7 @@ import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
  * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage
  * @generated
  */
-public class SectionAdapterFactory extends AdapterFactoryImpl
-{
+public class SectionAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
@@ -49,10 +49,8 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 *
 	 * @generated
 	 */
-	public SectionAdapterFactory()
-	{
-		if (modelPackage == null)
-		{
+	public SectionAdapterFactory() {
+		if (modelPackage == null) {
 			modelPackage = VSectionPackage.eINSTANCE;
 		}
 	}
@@ -68,14 +66,11 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public boolean isFactoryForType(Object object)
-	{
-		if (object == modelPackage)
-		{
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject)
-		{
+		if (object instanceof EObject) {
 			return ((EObject) object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -88,45 +83,42 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 *
 	 * @generated
 	 */
-	protected SectionSwitch<Adapter> modelSwitch =
-		new SectionSwitch<Adapter>()
-		{
-			@Override
-			public Adapter caseSectionedArea(VSectionedArea object)
-			{
-				return createSectionedAreaAdapter();
-			}
-
-			@Override
-			public Adapter caseSection(VSection object)
-			{
-				return createSectionAdapter();
-			}
-
-			@Override
-			public Adapter caseElement(VElement object)
-			{
-				return createElementAdapter();
-			}
-
-			@Override
-			public Adapter caseContainedElement(VContainedElement object)
-			{
-				return createContainedElementAdapter();
-			}
-
-			@Override
-			public Adapter caseContainer(VContainer object)
-			{
-				return createContainerAdapter();
-			}
-
-			@Override
-			public Adapter defaultCase(EObject object)
-			{
-				return createEObjectAdapter();
-			}
-		};
+	protected SectionSwitch<Adapter> modelSwitch = new SectionSwitch<Adapter>() {
+		@Override
+		public Adapter caseSectionedArea(VSectionedArea object) {
+			return createSectionedAreaAdapter();
+		}
+
+		@Override
+		public Adapter caseSection(VSection object) {
+			return createSectionAdapter();
+		}
+
+		@Override
+		public Adapter caseElement(VElement object) {
+			return createElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContainedElement(VContainedElement object) {
+			return createContainedElementAdapter();
+		}
+
+		@Override
+		public Adapter caseContainer(VContainer object) {
+			return createContainerAdapter();
+		}
+
+		@Override
+		public Adapter caseHasTooltip(VHasTooltip object) {
+			return createHasTooltipAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
@@ -138,8 +130,7 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public Adapter createAdapter(Notifier target)
-	{
+	public Adapter createAdapter(Notifier target) {
 		return modelSwitch.doSwitch((EObject) target);
 	}
 
@@ -155,8 +146,7 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea
 	 * @generated
 	 */
-	public Adapter createSectionedAreaAdapter()
-	{
+	public Adapter createSectionedAreaAdapter() {
 		return null;
 	}
 
@@ -172,8 +162,7 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.section.model.VSection
 	 * @generated
 	 */
-	public Adapter createSectionAdapter()
-	{
+	public Adapter createSectionAdapter() {
 		return null;
 	}
 
@@ -189,8 +178,7 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.model.VElement
 	 * @generated
 	 */
-	public Adapter createElementAdapter()
-	{
+	public Adapter createElementAdapter() {
 		return null;
 	}
 
@@ -206,8 +194,7 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.model.VContainedElement
 	 * @generated
 	 */
-	public Adapter createContainedElementAdapter()
-	{
+	public Adapter createContainedElementAdapter() {
 		return null;
 	}
 
@@ -223,8 +210,24 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @see org.eclipse.emf.ecp.view.spi.model.VContainer
 	 * @generated
 	 */
-	public Adapter createContainerAdapter()
-	{
+	public Adapter createContainerAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VHasTooltip <em>Has
+	 * Tooltip</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecp.view.spi.model.VHasTooltip
+	 * @generated
+	 * @since 1.13
+	 */
+	public Adapter createHasTooltipAdapter() {
 		return null;
 	}
 
@@ -237,8 +240,7 @@ public class SectionAdapterFactory extends AdapterFactoryImpl
 	 * @return the new adapter.
 	 * @generated
 	 */
-	public Adapter createEObjectAdapter()
-	{
+	public Adapter createEObjectAdapter() {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionSwitch.java b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionSwitch.java
index c19a037288..19bfb103f0 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionSwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/src/org/eclipse/emf/ecp/view/spi/section/model/util/SectionSwitch.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
 import org.eclipse.emf.ecp.view.spi.model.VContainer;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 import org.eclipse.emf.ecp.view.spi.section.model.VSection;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
@@ -35,8 +36,7 @@ import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
  * @see org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage
  * @generated
  */
-public class SectionSwitch<T> extends Switch<T>
-{
+public class SectionSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
@@ -53,10 +53,8 @@ public class SectionSwitch<T> extends Switch<T>
 	 *
 	 * @generated
 	 */
-	public SectionSwitch()
-	{
-		if (modelPackage == null)
-		{
+	public SectionSwitch() {
+		if (modelPackage == null) {
 			modelPackage = VSectionPackage.eINSTANCE;
 		}
 	}
@@ -66,13 +64,12 @@ public class SectionSwitch<T> extends Switch<T>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */
 	@Override
-	protected boolean isSwitchFor(EPackage ePackage)
-	{
+	protected boolean isSwitchFor(EPackage ePackage) {
 		return ePackage == modelPackage;
 	}
 
@@ -86,10 +83,8 @@ public class SectionSwitch<T> extends Switch<T>
 	 * @generated
 	 */
 	@Override
-	protected T doSwitch(int classifierID, EObject theEObject)
-	{
-		switch (classifierID)
-		{
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
 		case VSectionPackage.SECTIONED_AREA: {
 			final VSectionedArea sectionedArea = (VSectionedArea) theEObject;
 			T result = caseSectionedArea(sectionedArea);
@@ -111,6 +106,9 @@ public class SectionSwitch<T> extends Switch<T>
 				result = caseContainer(section);
 			}
 			if (result == null) {
+				result = caseHasTooltip(section);
+			}
+			if (result == null) {
 				result = caseElement(section);
 			}
 			if (result == null) {
@@ -135,8 +133,7 @@ public class SectionSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseSectionedArea(VSectionedArea object)
-	{
+	public T caseSectionedArea(VSectionedArea object) {
 		return null;
 	}
 
@@ -152,8 +149,7 @@ public class SectionSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseSection(VSection object)
-	{
+	public T caseSection(VSection object) {
 		return null;
 	}
 
@@ -169,8 +165,7 @@ public class SectionSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseElement(VElement object)
-	{
+	public T caseElement(VElement object) {
 		return null;
 	}
 
@@ -186,8 +181,7 @@ public class SectionSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseContainedElement(VContainedElement object)
-	{
+	public T caseContainedElement(VContainedElement object) {
 		return null;
 	}
 
@@ -203,8 +197,24 @@ public class SectionSwitch<T> extends Switch<T>
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseContainer(VContainer object)
-	{
+	public T caseContainer(VContainer object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Has Tooltip</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 * @since 1.13
+	 */
+	public T caseHasTooltip(VHasTooltip object) {
 		return null;
 	}
 
@@ -221,8 +231,7 @@ public class SectionSwitch<T> extends Switch<T>
 	 * @generated
 	 */
 	@Override
-	public T defaultCase(EObject object)
-	{
+	public T defaultCase(EObject object) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
index b6a85e36f5..cf7f40d420 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
@@ -2,24 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Section UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.ui.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.section.ui.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.section.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.section.swt;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.section.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.section.swt;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/SectionLeafSWTRendererService.xml,OSGI-INF/SectionNodeSWTRendererService.xml,OSGI-INF/SectionedAreaSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.graphics;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
index f7b75f1b8a..33e1129b36 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/AbstractSectionSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/AbstractSectionSWTRenderer.java
index e458ee2e9b..84cc10d01a 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/AbstractSectionSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/AbstractSectionSWTRenderer.java
@@ -17,6 +17,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.emf.databinding.EMFDataBindingContext;
 import org.eclipse.emf.ecp.view.internal.section.ui.swt.Activator;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
@@ -55,6 +56,8 @@ import org.osgi.framework.ServiceReference;
 public abstract class AbstractSectionSWTRenderer extends
 	AbstractSWTRenderer<VSection> {
 
+	private final EMFDataBindingContext dbc;
+
 	/**
 	 * @param vElement the view model element to be rendered
 	 * @param viewContext the view context
@@ -63,6 +66,7 @@ public abstract class AbstractSectionSWTRenderer extends
 	 */
 	public AbstractSectionSWTRenderer(VSection vElement, ViewModelContext viewContext, ReportService reportService) {
 		super(vElement, viewContext, reportService);
+		dbc = new EMFDataBindingContext();
 	}
 
 	@Override
@@ -248,6 +252,27 @@ public abstract class AbstractSectionSWTRenderer extends
 	}
 
 	/**
+	 * Returns the {@link EMFDataBindingContext}.
+	 *
+	 * @return the data binding context
+	 * @since 1.13
+	 */
+	protected EMFDataBindingContext getDataBindingContext() {
+		return dbc;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer#dispose()
+	 */
+	@Override
+	protected void dispose() {
+		dbc.dispose();
+		super.dispose();
+	}
+
+	/**
 	 * Called by the {@link org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea} when all children have been
 	 * renderered. Initialises the collapse state based on {@link VSection#isCollapsed()}.
 	 *
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/ExpandableCompositeTooltipProperty.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/ExpandableCompositeTooltipProperty.java
new file mode 100644
index 0000000000..6637cbdaed
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/ExpandableCompositeTooltipProperty.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.section.swt;
+
+import org.eclipse.jface.databinding.swt.WidgetValueProperty;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+
+/**
+ * Databinding Property for {@link ExpandableComposite}.
+ *
+ * @author Edgar Mueller
+ * @generated
+ * @since 1.13
+ */
+public class ExpandableCompositeTooltipProperty extends WidgetValueProperty {
+
+	public ExpandableCompositeTooltipProperty() {
+		super();
+	}
+
+	ExpandableCompositeTooltipProperty(int event) {
+		super(event);
+	}
+
+	ExpandableCompositeTooltipProperty(int[] events) {
+		super(events);
+	}
+
+	ExpandableCompositeTooltipProperty(int[] events, int[] staleEvents) {
+		super(events, staleEvents);
+	}
+
+	@Override
+	public Object getValueType() {
+		return String.class;
+	}
+
+	@Override
+	protected Object doGetValue(Object source) {
+		return doGetStringValue(source);
+	}
+
+	@Override
+	protected void doSetValue(Object source, Object value) {
+		doSetStringValue(source, (String) value);
+	}
+
+	// end of copied code
+
+	String doGetStringValue(Object source) {
+		return ((ExpandableComposite) source).getToolTipText();
+	}
+
+	void doSetStringValue(Object source, String value) {
+		((ExpandableComposite) source).setToolTipText(value == null ? "" : value); //$NON-NLS-1$
+	}
+
+	@Override
+	public String toString() {
+		return "Section.text <String>"; //$NON-NLS-1$
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java
index bae0369057..a01873b237 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionLeafSWTRenderer.java
@@ -13,13 +13,19 @@ package org.eclipse.emf.ecp.view.spi.section.swt;
 
 import javax.inject.Inject;
 
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.databinding.edit.EMFEditObservables;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.section.model.VSection;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emfforms.spi.common.report.ReportService;
 import org.eclipse.emfforms.spi.swt.core.layout.GridDescriptionFactory;
 import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -71,6 +77,14 @@ public class SectionLeafSWTRenderer extends AbstractSectionSWTRenderer {
 			: getVElement().getName();
 		label.setText(text);
 
+		final EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(getVElement());
+		final IObservableValue modelTooltipValue = EMFEditObservables.observeValue(
+			editingDomain,
+			getVElement(),
+			VViewPackage.eINSTANCE.getHasTooltip_Tooltip());
+		final IObservableValue targetTooltipValue = WidgetProperties.tooltipText().observe(label);
+		getDataBindingContext().bindValue(targetTooltipValue, modelTooltipValue);
+
 		return composite;
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
index 2d75eb313f..e9db0cf770 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
@@ -19,15 +19,20 @@ import java.util.Set;
 
 import javax.inject.Inject;
 
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.databinding.edit.EMFEditObservables;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.model.ModelChangeListener;
 import org.eclipse.emf.ecp.view.spi.model.ModelChangeNotification;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.section.model.VSection;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionPackage;
 import org.eclipse.emf.ecp.view.spi.section.model.VSectionedArea;
 import org.eclipse.emf.ecp.view.spi.swt.reporting.RenderingFailedReport;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emfforms.spi.common.report.ReportService;
 import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
 import org.eclipse.emfforms.spi.swt.core.EMFFormsNoRendererException;
@@ -232,13 +237,22 @@ public class SectionNodeSWTRenderer extends AbstractSectionSWTRenderer {
 			.extendedMargins(computeLeftMargin(), 0, 0, 0)
 			.applyTo(composite);
 
-		expandableComposite = new ExpandableComposite(
-			composite, SWT.NONE, ExpandableComposite.TWISTIE);
-		expandableComposite.setExpanded(!getVElement().isCollapsed());
+		setExpandableComposite(new ExpandableComposite(
+			composite, SWT.NONE, ExpandableComposite.TWISTIE));
+		getExpandableComposite().setExpanded(!getVElement().isCollapsed());
 		final String text = getVElement().getName() == null ? "" //$NON-NLS-1$
 			: getVElement().getName();
-		expandableComposite.setText(text);
-		initExpandableComposite(expandableComposite);
+		getExpandableComposite().setText(text);
+		initExpandableComposite(getExpandableComposite());
+
+		final EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(getVElement());
+		final IObservableValue modelTooltipValue = EMFEditObservables.observeValue(
+			editingDomain,
+			getVElement(),
+			VViewPackage.eINSTANCE.getHasTooltip_Tooltip());
+		final IObservableValue targetTooltipValue = new ExpandableCompositeTooltipProperty()
+			.observe(getExpandableComposite());
+		getDataBindingContext().bindValue(targetTooltipValue, modelTooltipValue);
 
 		return composite;
 	}
@@ -281,13 +295,13 @@ public class SectionNodeSWTRenderer extends AbstractSectionSWTRenderer {
 
 	@Override
 	protected void applyEnable() {
-		expandableComposite.setEnabled(getVElement().isEnabled());
+		getExpandableComposite().setEnabled(getVElement().isEnabled());
 	}
 
 	@Override
 	protected void applyReadOnly() {
 		super.applyReadOnly();
-		expandableComposite.getParent().setEnabled(true);
+		getExpandableComposite().getParent().setEnabled(true);
 	}
 
 	@Override
@@ -334,8 +348,24 @@ public class SectionNodeSWTRenderer extends AbstractSectionSWTRenderer {
 		}
 		getControls().values().iterator().next().getParent()
 			.layout(false);
-		expandableComposite.setExpanded(!getVElement()
+		getExpandableComposite().setExpanded(!getVElement()
 			.isCollapsed());
 	}
 
+	/**
+	 * @return the expandableComposite
+	 * @since 1.13
+	 */
+	protected ExpandableComposite getExpandableComposite() {
+		return expandableComposite;
+	}
+
+	/**
+	 * @param expandableComposite the expandableComposite to set
+	 * @since 1.13
+	 */
+	protected void setExpandableComposite(ExpandableComposite expandableComposite) {
+		this.expandableComposite = expandableComposite;
+	}
+
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
index 2b8485bd2e..a8061aa0c8 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.stack.model.provider.StackEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.emf.ecp.view.spi.stack.model.provider;version="0.1.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml
index 4020547ce1..8f235a15ef 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF
index 9bee577a6d..346f8c5b18 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,6 +11,6 @@ Export-Package: org.eclipse.emf.ecp.view.spi.stack.model;version="0.1.0",
  org.eclipse.emf.ecp.view.spi.stack.model.util;version="0.1.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml
index bc5fd477e9..9f63b88751 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
index 03dda49ab0..399be64b32 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.stack.ui.swt.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.stack.ui.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.stack.ui.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.custom;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml
index be275cffb8..63f006aeb1 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/src/org/eclipse/emf/ecp/view/spi/stack/ui/swt/SWTStackLayoutRenderer.java b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/src/org/eclipse/emf/ecp/view/spi/stack/ui/swt/SWTStackLayoutRenderer.java
index efa808b677..ebe4738e2d 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/src/org/eclipse/emf/ecp/view/spi/stack/ui/swt/SWTStackLayoutRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/src/org/eclipse/emf/ecp/view/spi/stack/ui/swt/SWTStackLayoutRenderer.java
@@ -122,7 +122,7 @@ public class SWTStackLayoutRenderer extends AbstractSWTRenderer<VStackLayout> im
 			} catch (final EMFFormsNoRendererException ex) {
 				getReportService().report(new StatusReport(
 					new Status(IStatus.INFO, Activator.PLUGIN_ID, String.format(
-						LocalizationServiceHelper.getString(getClass(),
+						LocalizationServiceHelper.getString(SWTStackLayoutRenderer.class,
 							MessageKeys.SWTStackLayoutRenderer_NoRendererForItemCompositeFound),
 						item.eClass()
 							.getName(),
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
index 15b1130bbb..8c657de0df 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Stack Layout Viewmodel
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.viewmodel;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml
index 5d80e745b3..cf547caeac 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF
index 945f4cffaa..e9eb5cfce9 100644
--- a/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default LayoutProvider
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.swt.layout;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml b/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml
index d950f220d1..7d42bc3238 100644
--- a/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.swt.layout</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF
index 173a7b431c..ee8b41feee 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI SWT Additional Cell Editors for Non-RAP Applications
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.celleditor.rcp;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.jface;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml
index 4b85f51f87..4a6f1b0248 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.celleditor.rcp</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
index af71164632..6d59fca691 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP View Table Column Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.columnservice;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.table.columnservice.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.columnservice;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.columnservice;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml
index 7dc3286330..043a2da0b4 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.columnservice</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
index 36671b045a..3c6c32cfbe 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Edapt Migration for Table View Model
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.edapt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml
index 20d1d4c67e..e76dd68b05 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.edapt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.table.model.edit/.settings/.api_filters
index 580f2fd613..7d5880acd3 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/.settings/.api_filters
@@ -32,4 +32,12 @@
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/emf/ecp/view/spi/table/model/provider/WidthConfigurationItemProvider.java" type="org.eclipse.emf.ecp.view.spi.table.model.provider.WidthConfigurationItemProvider">
+        <filter comment="SPI change" id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.provider.WidthConfigurationItemProvider"/>
+                <message_argument value="addColumnDomainReferencePropertyDescriptor(Object)"/>
+            </message_arguments>
+        </filter>
+    </resource>
 </component>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
index c7668caf1b..870d6c36ee 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.table.model.provider.TableEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_EnablementConfiguration.gif b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_EnablementConfiguration.gif
new file mode 100644
index 0000000000..cba683610a
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_EnablementConfiguration.gif
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_SingleColumnConfiguration.gif b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_SingleColumnConfiguration.gif
new file mode 100644
index 0000000000..3090830045
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_SingleColumnConfiguration.gif
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_WidthConfiguration.gif b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_WidthConfiguration.gif
index 21b4d3934a..f5db225284 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_WidthConfiguration.gif
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/ctool16/CreateTableControl_columnConfigurations_WidthConfiguration.gif
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/EnablementConfiguration.gif b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/EnablementConfiguration.gif
new file mode 100644
index 0000000000..b3643da048
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/EnablementConfiguration.gif
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/SingleColumnConfiguration.gif b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/SingleColumnConfiguration.gif
new file mode 100644
index 0000000000..a3908bcf7b
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/SingleColumnConfiguration.gif
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/WidthConfiguration.gif b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/WidthConfiguration.gif
index c3370c7ddd..98fd260c2f 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/WidthConfiguration.gif
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/icons/full/obj16/WidthConfiguration.gif
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/plugin.properties b/bundles/org.eclipse.emf.ecp.view.table.model.edit/plugin.properties
index 90bbbcdd1d..7faa3da990 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/plugin.properties
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/plugin.properties
@@ -1,59 +1,67 @@
-# Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.

-# 

-# 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:

-# Eugen Neufeld - initial API and implementation

-

-pluginName = Table Edit Support

-providerName = Eclipse Modeling Project

-

-_UI_CreateChild_text = {0}

-_UI_CreateChild_text2 = {1} {0}

-_UI_CreateChild_text3 = {1}

-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature

-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.

-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.

-

-_UI_PropertyDescriptor_description = The {0} of the {1}

-

-_UI_TableControl_type = TableControl

-_UI_TableColumn_type = Column

-_UI_Unknown_type = Object

-

-_UI_Unknown_datatype= Value

-

-_UI_TableControl_columns_feature = Columns

-_UI_TableControl_addRemoveDisabled_feature = Add Remove Disabled

-_UI_TableColumn_attribute_feature = Attribute

-_UI_TableColumn_readOnly_feature = Read Only

-_UI_Unknown_feature = Unspecified

-

-_UI_TableDomainModelReference_type = Table Domain Model Reference

-_UI_TableControl_enableDetailEditingDialog_feature = Enable Detail Editing Dialog

-_UI_TableColumn_domainModelReference_feature = Domain Model Reference

-_UI_TableDomainModelReference_columns_feature = Columns

-_UI_TableColumnConfiguration_type = Column Configuration

-_UI_TableControl_columnConfigurations_feature = Column Configurations

-_UI_TableColumnConfiguration_readOnly_feature = Read Only

-_UI_TableColumnConfiguration_columnDomainReference_feature = Column Domain Reference

-_UI_TableDomainModelReference_columnDomainModelReferences_feature = Column Domain Model References

-_UI_ReadOnlyColumnConfiguration_type = Read Only Column Configuration

-_UI_ReadOnlyColumnConfiguration_readOnly_feature = Read Only

-_UI_ReadOnlyColumnConfiguration_columnDomainReference_feature = Column Domain Reference

-_UI_ReadOnlyColumnConfiguration_columnDomainReferences_feature = Column Domain References

-_UI_TableControl_detailEditing_feature = Detail Editing

-_UI_DetailEditing_None_literal = None

-_UI_DetailEditing_WithDialog_literal = WithDialog

-_UI_DetailEditing_WithPanel_literal = WithPanel

-_UI_TableControl_detailView_feature = Detail View

-_UI_TableDomainModelReference_domainModelReference_feature = Domain Model Reference

-_UI_WidthConfiguration_type = Width Configuration

-_UI_WidthConfiguration_columnDomainReference_feature = Column Domain Reference

-_UI_WidthConfiguration_width_feature = Width

-_UI_WidthConfiguration_weight_feature = Weight

-_UI_WidthConfiguration_minWidth_feature = Min Width

-_UI_WidthConfiguration_tableWidth_feature = Table Width

+# Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+# 
+# 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:
+# Eugen Neufeld - initial API and implementation
+
+pluginName = Table Edit Support
+providerName = Eclipse Modeling Project
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_TableControl_type = TableControl
+_UI_TableColumn_type = Column
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_TableControl_columns_feature = Columns
+_UI_TableControl_addRemoveDisabled_feature = Add Remove Disabled
+_UI_TableColumn_attribute_feature = Attribute
+_UI_TableColumn_readOnly_feature = Read Only
+_UI_Unknown_feature = Unspecified
+
+_UI_TableDomainModelReference_type = Table Domain Model Reference
+_UI_TableControl_enableDetailEditingDialog_feature = Enable Detail Editing Dialog
+_UI_TableColumn_domainModelReference_feature = Domain Model Reference
+_UI_TableDomainModelReference_columns_feature = Columns
+_UI_TableColumnConfiguration_type = Column Configuration
+_UI_TableControl_columnConfigurations_feature = Column Configurations
+_UI_TableColumnConfiguration_readOnly_feature = Read Only
+_UI_TableColumnConfiguration_columnDomainReference_feature = Column Domain Reference
+_UI_TableDomainModelReference_columnDomainModelReferences_feature = Column Domain Model References
+_UI_ReadOnlyColumnConfiguration_type = Read Only Column Configuration
+_UI_ReadOnlyColumnConfiguration_readOnly_feature = Read Only
+_UI_ReadOnlyColumnConfiguration_columnDomainReference_feature = Column Domain Reference
+_UI_ReadOnlyColumnConfiguration_columnDomainReferences_feature = Column Domain References
+_UI_TableControl_detailEditing_feature = Detail Editing
+_UI_DetailEditing_None_literal = None
+_UI_DetailEditing_WithDialog_literal = WithDialog
+_UI_DetailEditing_WithPanel_literal = WithPanel
+_UI_TableControl_detailView_feature = Detail View
+_UI_TableDomainModelReference_domainModelReference_feature = Domain Model Reference
+_UI_WidthConfiguration_type = Width Configuration
+_UI_WidthConfiguration_columnDomainReference_feature = Column Domain Reference
+_UI_WidthConfiguration_width_feature = Width
+_UI_WidthConfiguration_weight_feature = Weight
+_UI_WidthConfiguration_minWidth_feature = Min Width
+_UI_WidthConfiguration_tableWidth_feature = Table Width
+_UI_WidthConfiguration_weight_description = The weight of the column. The renderer will calculate the width based on all given weights (relatively) and the total width of the table. If there is no weight specified for a column, the default "100" is used.
+_UI_WidthConfiguration_minWidth_description = The minimal width of the column in pixel. The column will not get smaller than this width, even when the user changes the width manually. If there is no minimal width specified for a column, the default "10" is used.
+_UI_EnablementConfiguration_type = Enablement Configuration
+_UI_EnablementConfiguration_columnDomainModelReference_feature = Column Domain Model Reference
+_UI_SingleColumnConfiguration_type = Single Column Configuration
+_UI_SingleColumnConfiguration_columnDomainModelReference_feature = Column Domain Model Reference
+_UI_SingleColumnConfiguration_columnDomainReference_feature = Column Domain Reference
+_UI_TableControl_moveUpDownDisabled_feature = Move Up Down Disabled
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml
index 0c6a9ce7c6..259823cfd3 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.table.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/EnablementConfigurationItemProvider.java b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/EnablementConfigurationItemProvider.java
new file mode 100644
index 0000000000..515b43ca72
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/EnablementConfigurationItemProvider.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.table.model.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecp.view.spi.model.provider.ElementItemProvider;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration}
+ * object.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.13
+ *        <!-- end-user-doc -->
+ * @generated
+ */
+public class EnablementConfigurationItemProvider extends ElementItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public EnablementConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addColumnDomainReferencePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Column Domain Reference feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addColumnDomainReferencePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_SingleColumnConfiguration_columnDomainReference_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+					"_UI_SingleColumnConfiguration_columnDomainReference_feature", //$NON-NLS-1$
+					"_UI_SingleColumnConfiguration_type"), //$NON-NLS-1$
+				VTablePackage.Literals.SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE,
+				true,
+				false,
+				true,
+				null,
+				null,
+				null));
+	}
+
+	/**
+	 * This returns EnablementConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/EnablementConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		final String label = ((VEnablementConfiguration) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_EnablementConfiguration_type") : //$NON-NLS-1$
+			getString("_UI_EnablementConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/ReadOnlyColumnConfigurationItemProvider.java b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/ReadOnlyColumnConfigurationItemProvider.java
index 9101d4d291..804e5cac04 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/ReadOnlyColumnConfigurationItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/ReadOnlyColumnConfigurationItemProvider.java
@@ -37,10 +37,8 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
  * @generated
  */
 public class ReadOnlyColumnConfigurationItemProvider
-	extends ItemProviderAdapter
-	implements
-	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-	IItemPropertySource {
+	extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/SingleColumnConfigurationItemProvider.java b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/SingleColumnConfigurationItemProvider.java
new file mode 100644
index 0000000000..516bce6182
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/SingleColumnConfigurationItemProvider.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.table.model.provider;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration}
+ * object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @since 1.13
+ */
+public class SingleColumnConfigurationItemProvider
+	extends ItemProviderAdapter
+	implements
+	IEditingDomainItemProvider,
+	IStructuredItemContentProvider,
+	ITreeItemContentProvider,
+	IItemLabelProvider,
+	IItemPropertySource {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public SingleColumnConfigurationItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns SingleColumnConfiguration.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/SingleColumnConfiguration")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_SingleColumnConfiguration_type"); //$NON-NLS-1$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableControlItemProvider.java b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableControlItemProvider.java
index 09548548b9..b70c81d69a 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableControlItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableControlItemProvider.java
@@ -1,278 +1,307 @@
-/**

- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Eugen Neufeld - initial API and implementation

- */

-package org.eclipse.emf.ecp.view.spi.table.model.provider;

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecp.view.spi.model.VElement;

-import org.eclipse.emf.ecp.view.spi.model.VElementUtil;

-import org.eclipse.emf.ecp.view.spi.model.VViewFactory;

-import org.eclipse.emf.ecp.view.spi.model.VViewPackage;

-import org.eclipse.emf.ecp.view.spi.model.provider.ControlItemProvider;

-import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;

-import org.eclipse.emf.ecp.view.spi.table.model.VTableFactory;

-import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;

-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.ViewerNotification;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public class TableControlItemProvider

-	extends ControlItemProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public TableControlItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-			addAddRemoveDisabledPropertyDescriptor(object);

-			addDetailEditingPropertyDescriptor(object);

-			addDetailViewPropertyDescriptor(object);

-			addEnableDetailEditingDialogPropertyDescriptor(object);

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This adds a property descriptor for the Add Remove Disabled feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addAddRemoveDisabledPropertyDescriptor(Object object) {

-		itemPropertyDescriptors

-			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-				getResourceLocator(),

-				getString("_UI_TableControl_addRemoveDisabled_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_addRemoveDisabled_feature", //$NON-NLS-1$ //$NON-NLS-2$

-					"_UI_TableControl_type"), //$NON-NLS-1$

-				VTablePackage.Literals.TABLE_CONTROL__ADD_REMOVE_DISABLED,

-				true,

-				false,

-				false,

-				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				null,

-				null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Detail Editing feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDetailEditingPropertyDescriptor(Object object) {

-		itemPropertyDescriptors

-			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-				getResourceLocator(),

-				getString("_UI_TableControl_detailEditing_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_detailEditing_feature", //$NON-NLS-1$ //$NON-NLS-2$

-					"_UI_TableControl_type"), //$NON-NLS-1$

-				VTablePackage.Literals.TABLE_CONTROL__DETAIL_EDITING,

-				true,

-				false,

-				false,

-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,

-				null,

-				null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Detail View feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addDetailViewPropertyDescriptor(Object object) {

-		itemPropertyDescriptors

-			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-				getResourceLocator(),

-				getString("_UI_TableControl_detailView_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_detailView_feature", //$NON-NLS-1$ //$NON-NLS-2$

-					"_UI_TableControl_type"), //$NON-NLS-1$

-				VTablePackage.Literals.TABLE_CONTROL__DETAIL_VIEW,

-				true,

-				false,

-				false,

-				null,

-				null,

-				null));

-	}

-

-	/**

-	 * This adds a property descriptor for the Enable Detail Editing Dialog feature.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	protected void addEnableDetailEditingDialogPropertyDescriptor(Object object) {

-		itemPropertyDescriptors

-			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),

-				getResourceLocator(),

-				getString("_UI_TableControl_enableDetailEditingDialog_feature"), //$NON-NLS-1$

-				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_enableDetailEditingDialog_feature", //$NON-NLS-1$ //$NON-NLS-2$

-					"_UI_TableControl_type"), //$NON-NLS-1$

-				VTablePackage.Literals.TABLE_CONTROL__ENABLE_DETAIL_EDITING_DIALOG,

-				true,

-				false,

-				false,

-				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,

-				null,

-				null));

-	}

-

-	/**

-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an

-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or

-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {

-		if (childrenFeatures == null) {

-			super.getChildrenFeatures(object);

-			childrenFeatures.add(VTablePackage.Literals.TABLE_CONTROL__COLUMN_CONFIGURATIONS);

-			childrenFeatures.add(VTablePackage.Literals.TABLE_CONTROL__DETAIL_VIEW);

-		}

-		return childrenFeatures;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected EStructuralFeature getChildFeature(Object object, Object child) {

-		// Check the type of the specified child object and return the proper feature to use for

-		// adding (see {@link AddCommand}) it as a child.

-

-		return super.getChildFeature(object, child);

-	}

-

-	/**

-	 * This returns TableControl.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableControl")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated NOT

-	 */

-	@Override

-	public String getText(Object object) {

-		String label = ((VTableControl) object).getName();

-		if (label == null) {

-			label = VElementUtil.getCleanName(VElement.class.cast(object));

-		}

-		return label == null || label.length() == 0 ? getString("_UI_TableControl_type") //$NON-NLS-1$

-			: getString("_UI_TableControl_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-

-		switch (notification.getFeatureID(VTableControl.class)) {

-		case VTablePackage.TABLE_CONTROL__ADD_REMOVE_DISABLED:

-		case VTablePackage.TABLE_CONTROL__DETAIL_EDITING:

-		case VTablePackage.TABLE_CONTROL__ENABLE_DETAIL_EDITING_DIALOG:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));

-			return;

-		case VTablePackage.TABLE_CONTROL__COLUMN_CONFIGURATIONS:

-		case VTablePackage.TABLE_CONTROL__DETAIL_VIEW:

-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));

-			return;

-		}

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-

-		newChildDescriptors.add(createChildParameter(VViewPackage.Literals.CONTROL__DOMAIN_MODEL_REFERENCE,

-			VTableFactory.eINSTANCE.createTableDomainModelReference()));

-

-		newChildDescriptors.add(createChildParameter(VTablePackage.Literals.TABLE_CONTROL__COLUMN_CONFIGURATIONS,

-			VTableFactory.eINSTANCE.createReadOnlyColumnConfiguration()));

-

-		newChildDescriptors.add(createChildParameter(VTablePackage.Literals.TABLE_CONTROL__COLUMN_CONFIGURATIONS,

-			VTableFactory.eINSTANCE.createWidthConfiguration()));

-

-		newChildDescriptors.add(createChildParameter(VTablePackage.Literals.TABLE_CONTROL__DETAIL_VIEW,

-			VViewFactory.eINSTANCE.createView()));

-	}

-

-}

+/**
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.table.model.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VElementUtil;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
+import org.eclipse.emf.ecp.view.spi.model.provider.ControlItemProvider;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableFactory;
+import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TableControlItemProvider
+	extends ControlItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public TableControlItemProvider(AdapterFactory adapterFactory) {
+		super(adapterFactory);
+	}
+
+	/**
+	 * This returns the property descriptors for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
+			super.getPropertyDescriptors(object);
+
+			addAddRemoveDisabledPropertyDescriptor(object);
+			addMoveUpDownDisabledPropertyDescriptor(object);
+			addDetailEditingPropertyDescriptor(object);
+			addDetailViewPropertyDescriptor(object);
+			addEnableDetailEditingDialogPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Add Remove Disabled feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addAddRemoveDisabledPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_TableControl_addRemoveDisabled_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_addRemoveDisabled_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_TableControl_type"), //$NON-NLS-1$
+				VTablePackage.Literals.TABLE_CONTROL__ADD_REMOVE_DISABLED,
+				true,
+				false,
+				false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Move Up Down Disabled feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @since 1.13
+	 */
+	protected void addMoveUpDownDisabledPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_TableControl_moveUpDownDisabled_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_moveUpDownDisabled_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_TableControl_type"), //$NON-NLS-1$
+				VTablePackage.Literals.TABLE_CONTROL__MOVE_UP_DOWN_DISABLED,
+				true,
+				false,
+				false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Detail Editing feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addDetailEditingPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_TableControl_detailEditing_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_detailEditing_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_TableControl_type"), //$NON-NLS-1$
+				VTablePackage.Literals.TABLE_CONTROL__DETAIL_EDITING,
+				true,
+				false,
+				false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Detail View feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addDetailViewPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_TableControl_detailView_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_detailView_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_TableControl_type"), //$NON-NLS-1$
+				VTablePackage.Literals.TABLE_CONTROL__DETAIL_VIEW,
+				true,
+				false,
+				false,
+				null,
+				null,
+				null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Enable Detail Editing Dialog feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void addEnableDetailEditingDialogPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(),
+				getString("_UI_TableControl_enableDetailEditingDialog_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_TableControl_enableDetailEditingDialog_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_TableControl_type"), //$NON-NLS-1$
+				VTablePackage.Literals.TABLE_CONTROL__ENABLE_DETAIL_EDITING_DIALOG,
+				true,
+				false,
+				false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				null,
+				null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(VTablePackage.Literals.TABLE_CONTROL__COLUMN_CONFIGURATIONS);
+			childrenFeatures.add(VTablePackage.Literals.TABLE_CONTROL__DETAIL_VIEW);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns TableControl.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/TableControl")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((VTableControl) object).getName();
+		if (label == null) {
+			label = VElementUtil.getCleanName(VElement.class.cast(object));
+		}
+		return label == null || label.length() == 0 ? getString("_UI_TableControl_type") //$NON-NLS-1$
+			: getString("_UI_TableControl_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void notifyChanged(Notification notification) {
+		updateChildren(notification);
+
+		switch (notification.getFeatureID(VTableControl.class)) {
+		case VTablePackage.TABLE_CONTROL__ADD_REMOVE_DISABLED:
+		case VTablePackage.TABLE_CONTROL__MOVE_UP_DOWN_DISABLED:
+		case VTablePackage.TABLE_CONTROL__DETAIL_EDITING:
+		case VTablePackage.TABLE_CONTROL__ENABLE_DETAIL_EDITING_DIALOG:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case VTablePackage.TABLE_CONTROL__COLUMN_CONFIGURATIONS:
+		case VTablePackage.TABLE_CONTROL__DETAIL_VIEW:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
+		}
+		super.notifyChanged(notification);
+	}
+
+	/**
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+		super.collectNewChildDescriptors(newChildDescriptors, object);
+
+		newChildDescriptors.add(createChildParameter(VViewPackage.Literals.CONTROL__DOMAIN_MODEL_REFERENCE,
+			VTableFactory.eINSTANCE.createTableDomainModelReference()));
+
+		newChildDescriptors.add(createChildParameter(VTablePackage.Literals.TABLE_CONTROL__COLUMN_CONFIGURATIONS,
+			VTableFactory.eINSTANCE.createReadOnlyColumnConfiguration()));
+
+		newChildDescriptors.add(createChildParameter(VTablePackage.Literals.TABLE_CONTROL__COLUMN_CONFIGURATIONS,
+			VTableFactory.eINSTANCE.createWidthConfiguration()));
+
+		newChildDescriptors.add(createChildParameter(VTablePackage.Literals.TABLE_CONTROL__COLUMN_CONFIGURATIONS,
+			VTableFactory.eINSTANCE.createEnablementConfiguration()));
+
+		newChildDescriptors.add(createChildParameter(VTablePackage.Literals.TABLE_CONTROL__DETAIL_VIEW,
+			VViewFactory.eINSTANCE.createView()));
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableEditPlugin.java b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableEditPlugin.java
index 9db1f750a7..b517ed7d55 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableEditPlugin.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableEditPlugin.java
@@ -1,108 +1,106 @@
-/**

- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Eugen Neufeld - initial API and implementation

- */

-package org.eclipse.emf.ecp.view.spi.table.model.provider;

-

-import org.eclipse.emf.common.EMFPlugin;

-import org.eclipse.emf.common.util.ResourceLocator;

-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-import org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin;

-

-/**

- * This is the central singleton for the Table edit plugin.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- *

- * @generated

- */

-public final class TableEditPlugin extends EMFPlugin {

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static final TableEditPlugin INSTANCE = new TableEditPlugin();

-

-	/**

-	 * Keep track of the singleton.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	private static Implementation plugin;

-

-	/**

-	 * Create the instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public TableEditPlugin() {

-		super(new ResourceLocator[] {

-			EcoreEditPlugin.INSTANCE,

-			ViewEditPlugin.INSTANCE,

-		});

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	@Override

-	public ResourceLocator getPluginResourceLocator() {

-		return plugin;

-	}

-

-	/**

-	 * Returns the singleton instance of the Eclipse plugin.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @return the singleton instance.

-	 * @generated

-	 */

-	public static Implementation getPlugin() {

-		return plugin;

-	}

-

-	/**

-	 * The actual implementation of the Eclipse <b>Plugin</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 *

-	 * @generated

-	 */

-	public static class Implementation extends EclipsePlugin {

-		/**

-		 * Creates an instance.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 *

-		 * @generated

-		 */

-		public Implementation() {

-			super();

-

-			// Remember the static instance.

-			//

-			plugin = this;

-		}

-	}

-

-}

+/**
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.table.model.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin;
+
+/**
+ * This is the central singleton for the Table edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class TableEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final TableEditPlugin INSTANCE = new TableEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public TableEditPlugin() {
+		super(new ResourceLocator[] {
+			ViewEditPlugin.INSTANCE,
+		});
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableItemProviderAdapterFactory.java
index c1f37b970a..0d498b0606 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/TableItemProviderAdapterFactory.java
@@ -215,6 +215,33 @@ public class TableItemProviderAdapterFactory extends TableAdapterFactory impleme
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all
+	 * {@link org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration} instances.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EnablementConfigurationItemProvider enablementConfigurationItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Adapter createEnablementConfigurationAdapter() {
+		if (enablementConfigurationItemProvider == null) {
+			enablementConfigurationItemProvider = new EnablementConfigurationItemProvider(this);
+		}
+
+		return enablementConfigurationItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -372,6 +399,9 @@ public class TableItemProviderAdapterFactory extends TableAdapterFactory impleme
 		if (widthConfigurationItemProvider != null) {
 			widthConfigurationItemProvider.dispose();
 		}
+		if (enablementConfigurationItemProvider != null) {
+			enablementConfigurationItemProvider.dispose();
+		}
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/WidthConfigurationItemProvider.java b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/WidthConfigurationItemProvider.java
index 4b2b7736c7..cebfbe6dff 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/WidthConfigurationItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/src/org/eclipse/emf/ecp/view/spi/table/model/provider/WidthConfigurationItemProvider.java
@@ -17,9 +17,11 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
 import org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IChildCreationExtender;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -40,13 +42,8 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
  * @generated
  */
 public class WidthConfigurationItemProvider
-	extends ItemProviderAdapter
-	implements
-	IEditingDomainItemProvider,
-	IStructuredItemContentProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource {
+	extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider,
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -88,10 +85,11 @@ public class WidthConfigurationItemProvider
 		itemPropertyDescriptors
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
-				getString("_UI_WidthConfiguration_columnDomainReference_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_WidthConfiguration_columnDomainReference_feature", //$NON-NLS-1$ //$NON-NLS-2$
-					"_UI_WidthConfiguration_type"), //$NON-NLS-1$
-				VTablePackage.Literals.WIDTH_CONFIGURATION__COLUMN_DOMAIN_REFERENCE,
+				getString("_UI_SingleColumnConfiguration_columnDomainReference_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+					"_UI_SingleColumnConfiguration_columnDomainReference_feature", //$NON-NLS-1$
+					"_UI_SingleColumnConfiguration_type"), //$NON-NLS-1$
+				VTablePackage.Literals.SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE,
 				true,
 				false,
 				true,
@@ -112,8 +110,7 @@ public class WidthConfigurationItemProvider
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_WidthConfiguration_weight_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_WidthConfiguration_weight_feature", //$NON-NLS-1$ //$NON-NLS-2$
-					"_UI_WidthConfiguration_type"), //$NON-NLS-1$
+				getString("_UI_WidthConfiguration_weight_description"), //$NON-NLS-1$
 				VTablePackage.Literals.WIDTH_CONFIGURATION__WEIGHT,
 				true,
 				false,
@@ -135,8 +132,7 @@ public class WidthConfigurationItemProvider
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_WidthConfiguration_minWidth_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_WidthConfiguration_minWidth_feature", //$NON-NLS-1$ //$NON-NLS-2$
-					"_UI_WidthConfiguration_type"), //$NON-NLS-1$
+				getString("_UI_WidthConfiguration_minWidth_description"), //$NON-NLS-1$
 				VTablePackage.Literals.WIDTH_CONFIGURATION__MIN_WIDTH,
 				true,
 				false,
@@ -163,12 +159,25 @@ public class WidthConfigurationItemProvider
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
 		final VWidthConfiguration widthConfiguration = (VWidthConfiguration) object;
-		return getString("_UI_WidthConfiguration_type") + " " + widthConfiguration.getWeight(); //$NON-NLS-1$ //$NON-NLS-2$
+		final VDomainModelReference columnDomainReference = widthConfiguration.getColumnDomainReference();
+		String label;
+		if (columnDomainReference == null) {
+			label = "<none>"; //$NON-NLS-1$
+		} else {
+			final ComposedAdapterFactory composedAdapterFactory = new ComposedAdapterFactory(new AdapterFactory[] {
+				new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE) });
+			final IItemLabelProvider adapt = (IItemLabelProvider) composedAdapterFactory.adapt(columnDomainReference,
+				IItemLabelProvider.class);
+			label = adapt == null ? "<none>" : adapt.getText(columnDomainReference); //$NON-NLS-1$
+			composedAdapterFactory.dispose();
+		}
+
+		return getString("_UI_WidthConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.table.model/.settings/.api_filters
index 0bafe5d1f6..83cab44696 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/.settings/.api_filters
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.emf.ecp.view.table.model" version="2">
     <resource path="META-INF/MANIFEST.MF">
+        <filter comment="SPI Change 1.13.0" id="923795461">
+            <message_arguments>
+                <message_argument value="1.13.0"/>
+                <message_argument value="1.12.0"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Change with 1.5.0" id="923795461">
             <message_arguments>
                 <message_argument value="1.5.0"/>
@@ -59,6 +65,18 @@
         </filter>
     </resource>
     <resource path="src/org/eclipse/emf/ecp/view/spi/table/model/VTableFactory.java" type="org.eclipse.emf.ecp.view.spi.table.model.VTableFactory">
+        <filter comment="SPI change" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTableFactory"/>
+                <message_argument value="createEnablementConfiguration()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTableFactory"/>
+                <message_argument value="createSingleColumnConfiguration()"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Change 1.9.0" id="403804204">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTableFactory"/>
@@ -74,6 +92,27 @@
                 <message_argument value="4"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI change" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="DETAIL_EDITING"/>
+                <message_argument value="5"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="READ_ONLY_COLUMN_CONFIGURATION_FEATURE_COUNT"/>
+                <message_argument value="1"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="READ_ONLY_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCES"/>
+                <message_argument value="0"/>
+            </message_arguments>
+        </filter>
         <filter comment="Changes due to new label field in 1.6" id="388194388">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
@@ -235,6 +274,108 @@
                 <message_argument value="http://org/eclipse/emf/ecp/view/table/model"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION_FEATURE_COUNT"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__ATTACHMENTS"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_MODEL_REFERENCE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__DIAGNOSTIC"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__ENABLED"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__LABEL"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__NAME"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__READONLY"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__UUID"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__VISIBLE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="READ_ONLY_COLUMN_CONFIGURATION__COLUMN_DOMAIN_MODEL_REFERENCE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="SINGLE_COLUMN_CONFIGURATION"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="SINGLE_COLUMN_CONFIGURATION_FEATURE_COUNT"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_MODEL_REFERENCE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Change 1.9.0" id="403767336">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
@@ -265,6 +406,12 @@
                 <message_argument value="WIDTH_CONFIGURATION_FEATURE_COUNT"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="WIDTH_CONFIGURATION__COLUMN_DOMAIN_MODEL_REFERENCE"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Change 1.9.0" id="403767336">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
@@ -289,6 +436,36 @@
                 <message_argument value="WIDTH_CONFIGURATION__WIDTH"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI change" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="getEnablementConfiguration()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="getEnablementConfiguration_ColumnDomainModelReference()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="getSingleColumnConfiguration()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="getSingleColumnConfiguration_ColumnDomainModelReference()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change 1.13.0" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="getSingleColumnConfiguration_ColumnDomainReference()"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Change with 1.5.0" id="403804204">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
@@ -325,8 +502,50 @@
                 <message_argument value="getWidthConfiguration_Width()"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI change" id="405864542">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="WIDTH_CONFIGURATION__COLUMN_DOMAIN_REFERENCE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="405901410">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage"/>
+                <message_argument value="getWidthConfiguration_ColumnDomainReference()"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java" type="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage$Literals">
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage.Literals"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage.Literals"/>
+                <message_argument value="ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_MODEL_REFERENCE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage.Literals"/>
+                <message_argument value="SINGLE_COLUMN_CONFIGURATION"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage.Literals"/>
+                <message_argument value="SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_MODEL_REFERENCE"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Change 1.13.0" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage.Literals"/>
+                <message_argument value="SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Change with 1.5.0" id="403767336">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage.Literals"/>
@@ -363,5 +582,59 @@
                 <message_argument value="WIDTH_CONFIGURATION__WIDTH"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI change" id="405864542">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VTablePackage.Literals"/>
+                <message_argument value="WIDTH_CONFIGURATION__COLUMN_DOMAIN_REFERENCE"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java" type="org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration">
+        <filter comment="SPI change" id="405901410">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration"/>
+                <message_argument value="getColumnDomainReference()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="405901410">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration"/>
+                <message_argument value="setColumnDomainReference(VDomainModelReference)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java" type="org.eclipse.emf.ecp.view.spi.table.model.impl.VTablePackageImpl">
+        <filter comment="SPI change" id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.impl.VTablePackageImpl"/>
+                <message_argument value="getWidthConfiguration_ColumnDomainReference()"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emf/ecp/view/spi/table/model/impl/VWidthConfigurationImpl.java" type="org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl">
+        <filter comment="SPI change" id="338755678">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl"/>
+                <message_argument value="columnDomainReference"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl"/>
+                <message_argument value="basicGetColumnDomainReference()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl"/>
+                <message_argument value="getColumnDomainReference()"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI change" id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl"/>
+                <message_argument value="setColumnDomainReference(VDomainModelReference)"/>
+            </message_arguments>
+        </filter>
     </resource>
 </component>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
index 31f70d6279..854e01b2b4 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
@@ -2,25 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.table.model.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.table.generator;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.columnservice,org.eclipse.emf.ecp.view.table.editor",
- org.eclipse.emf.ecp.view.internal.table.model;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.table.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.generator;version="1.13.0";
+  x-friends:="org.eclipse.emf.ecp.view.table.columnservice,
+   org.eclipse.emf.ecp.view.table.editor",
+ org.eclipse.emf.ecp.view.internal.table.model;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.table.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.table.model.TableDMRConverter.xml
 Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore
index 3beaa1fed8..520b503f72 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore
@@ -1,69 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-	name="table" nsURI="http://org/eclipse/emf/ecp/view/table/model/150"
-	nsPrefix="org.eclipse.emf.ecp.view.table.model">
-	<eClassifiers xsi:type="ecore:EClass" name="TableControl"
-		eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Control">
-		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-			<details key="constraints" value="resolveable" />
-		</eAnnotations>
-		<eStructuralFeatures xsi:type="ecore:EAttribute"
-			name="addRemoveDisabled" lowerBound="1"
-			eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-			defaultValueLiteral="false" />
-		<eStructuralFeatures xsi:type="ecore:EReference"
-			name="columnConfigurations" upperBound="-1" eType="#//TableColumnConfiguration"
-			containment="true" />
-		<eStructuralFeatures xsi:type="ecore:EAttribute"
-			name="detailEditing" lowerBound="1" eType="#//DetailEditing"
-			defaultValueLiteral="None" />
-		<eStructuralFeatures xsi:type="ecore:EReference"
-			name="detailView"
-			eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//View"
-			containment="true" />
-		<eStructuralFeatures xsi:type="ecore:EAttribute"
-			name="enableDetailEditingDialog"
-			eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-			defaultValueLiteral="false" />
-	</eClassifiers>
-	<eClassifiers xsi:type="ecore:EClass" name="TableColumnConfiguration"
-		abstract="true" interface="true" />
-	<eClassifiers xsi:type="ecore:EClass" name="TableDomainModelReference"
-		eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//FeaturePathDomainModelReference">
-		<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-			<details key="constraints" value="resolveable" />
-		</eAnnotations>
-		<eStructuralFeatures xsi:type="ecore:EReference"
-			name="columnDomainModelReferences" upperBound="-1"
-			eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
-			containment="true" />
-		<eStructuralFeatures xsi:type="ecore:EReference"
-			name="domainModelReference"
-			eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
-			containment="true" />
-	</eClassifiers>
-	<eClassifiers xsi:type="ecore:EClass" name="ReadOnlyColumnConfiguration"
-		eSuperTypes="#//TableColumnConfiguration">
-		<eStructuralFeatures xsi:type="ecore:EReference"
-			name="columnDomainReferences" upperBound="-1"
-			eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference" />
-	</eClassifiers>
-	<eClassifiers xsi:type="ecore:EEnum" name="DetailEditing">
-		<eLiterals name="None" literal="None" />
-		<eLiterals name="WithDialog" value="1" literal="WithDialog" />
-		<eLiterals name="WithPanel" value="2" />
-	</eClassifiers>
-	<eClassifiers xsi:type="ecore:EClass" name="WidthConfiguration"
-		eSuperTypes="#//TableColumnConfiguration">
-		<eStructuralFeatures xsi:type="ecore:EReference"
-			name="columnDomainReference" lowerBound="1"
-			eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference" />
-		<eStructuralFeatures xsi:type="ecore:EAttribute"
-			name="weight" lowerBound="1"
-			eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" />
-		<eStructuralFeatures xsi:type="ecore:EAttribute"
-			name="minWidth" lowerBound="1"
-			eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" />
-	</eClassifiers>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="table" nsURI="http://org/eclipse/emf/ecp/view/table/model/150"
+    nsPrefix="org.eclipse.emf.ecp.view.table.model">
+  <eClassifiers xsi:type="ecore:EClass" name="TableControl" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Control">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+      <details key="constraints" value="resolveable"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="addRemoveDisabled" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="moveUpDownDisabled" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="columnConfigurations" upperBound="-1"
+        eType="#//TableColumnConfiguration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="detailEditing" lowerBound="1"
+        eType="#//DetailEditing" defaultValueLiteral="None"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="detailView" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//View"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="enableDetailEditingDialog"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TableColumnConfiguration" abstract="true"
+      interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TableDomainModelReference" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//FeaturePathDomainModelReference">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+      <details key="constraints" value="resolveable"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="columnDomainModelReferences"
+        upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ReadOnlyColumnConfiguration" eSuperTypes="#//TableColumnConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="columnDomainReferences"
+        upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="DetailEditing">
+    <eLiterals name="None" literal="None"/>
+    <eLiterals name="WithDialog" value="1" literal="WithDialog"/>
+    <eLiterals name="WithPanel" value="2"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="WidthConfiguration" eSuperTypes="#//SingleColumnConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="weight" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EnablementConfiguration" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Element #//SingleColumnConfiguration"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SingleColumnConfiguration" abstract="true"
+      interface="true" eSuperTypes="#//TableColumnConfiguration">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="columnDomainReference"
+        lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.genmodel b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.genmodel
index 77ae4986e3..da86eae171 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.genmodel
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.genmodel
@@ -4,7 +4,7 @@
     modelDirectory="/org.eclipse.emf.ecp.view.table.model/src" modelPluginID="org.eclipse.emf.ecp.view.table.model"
     modelName="Table" nonNLSMarkers="true" codeFormatting="true" commentFormatting="true"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
+    usedGenPackages="../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
     interfaceNamePattern="V{0}" classNamePattern="V{0}Impl">
   <foreignModel>table.ecore</foreignModel>
   <genPackages prefix="Table" basePackage="org.eclipse.emf.ecp.view.spi" disposableProviderFactory="true"
@@ -33,9 +33,14 @@
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"/>
     </genClasses>
     <genClasses ecoreClass="table.ecore#//WidthConfiguration">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference table.ecore#//WidthConfiguration/columnDomainReference"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute table.ecore#//WidthConfiguration/weight"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute table.ecore#//WidthConfiguration/minWidth"/>
+      <genFeatures createChild="false" propertyDescription="The weight of the column. The renderer will calculate the width based on all given weights (relatively) and the total width of the table. If there is no weight specified for a column, the default &quot;100&quot; is used."
+          ecoreFeature="ecore:EAttribute table.ecore#//WidthConfiguration/weight"/>
+      <genFeatures createChild="false" propertyDescription="The minimal width of the column in pixel. The column will not get smaller than this width, even when the user changes the width manually. If there is no minimal width specified for a column, the default &quot;10&quot; is used."
+          ecoreFeature="ecore:EAttribute table.ecore#//WidthConfiguration/minWidth"/>
+    </genClasses>
+    <genClasses ecoreClass="table.ecore#//EnablementConfiguration"/>
+    <genClasses ecoreClass="table.ecore#//SingleColumnConfiguration">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference table.ecore#//SingleColumnConfiguration/columnDomainReference"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.history b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.history
index c666a860f5..d67ca22d26 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.history
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.history
@@ -1,289 +1,409 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<history:History xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:history="http://www.eclipse.org/emf/edapt/history/0.3">
-  <releases date="2014-10-16T15:51:48.763+0200" label="140">
-    <changes xsi:type="history:CompositeChange">
-      <changes xsi:type="history:Create" element="table.ecore#/">
-        <changes xsi:type="history:Set" element="table.ecore#/" featureName="name"
-            dataValue="table"/>
-        <changes xsi:type="history:Set" element="table.ecore#/" featureName="nsURI"
-            dataValue="http://org/eclipse/emf/ecp/view/table/model"/>
-        <changes xsi:type="history:Set" element="table.ecore#/" featureName="nsPrefix"
-            dataValue="org.eclipse.emf.ecp.view.table.model"/>
+<history:History xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:history="http://www.eclipse.org/emf/edapt/history/0.3" xmi:id="_pz1A0B96Eeemy-pWGWHIRA">
+  <releases xmi:id="_p0AnAB96Eeemy-pWGWHIRA" date="2014-10-16T15:51:48.763+0200" label="140">
+    <changes xsi:type="history:CompositeChange" xmi:id="_p0B1IB96Eeemy-pWGWHIRA">
+      <changes xsi:type="history:Create" xmi:id="_p0DqUB96Eeemy-pWGWHIRA">
+        <element href="table.ecore#/"/>
+        <changes xsi:type="history:Set" xmi:id="_p0E4cB96Eeemy-pWGWHIRA" featureName="name" dataValue="table">
+          <element href="table.ecore#/"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0E4cR96Eeemy-pWGWHIRA" featureName="nsURI" dataValue="http://org/eclipse/emf/ecp/view/table/model">
+          <element href="table.ecore#/"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0E4ch96Eeemy-pWGWHIRA" featureName="nsPrefix" dataValue="org.eclipse.emf.ecp.view.table.model">
+          <element href="table.ecore#/"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#/" referenceName="eClassifiers"
-          element="table.ecore#//TableControl">
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl" featureName="name"
-            dataValue="TableControl"/>
-        <changes xsi:type="history:Add" element="table.ecore#//TableControl" featureName="eSuperTypes"
-            referenceValue="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Control"/>
+      <changes xsi:type="history:Create" xmi:id="_p0FfgB96Eeemy-pWGWHIRA" referenceName="eClassifiers">
+        <target href="table.ecore#/"/>
+        <element href="table.ecore#//TableControl"/>
+        <changes xsi:type="history:Set" xmi:id="_p0FfgR96Eeemy-pWGWHIRA" featureName="name" dataValue="TableControl">
+          <element href="table.ecore#//TableControl"/>
+        </changes>
+        <changes xsi:type="history:Add" xmi:id="_p0Ffgh96Eeemy-pWGWHIRA" featureName="eSuperTypes">
+          <element href="table.ecore#//TableControl"/>
+          <referenceValue href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Control"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//TableControl" referenceName="eStructuralFeatures"
-          element="table.ecore#//TableControl/addRemoveDisabled">
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/addRemoveDisabled"
-            featureName="name" dataValue="addRemoveDisabled"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/addRemoveDisabled"
-            featureName="lowerBound" dataValue="1" oldDataValue="0"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/addRemoveDisabled"
-            featureName="defaultValueLiteral" dataValue="false"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/addRemoveDisabled"
-            featureName="eType" referenceValue="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <changes xsi:type="history:Create" xmi:id="_p0Ffgx96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//TableControl"/>
+        <element href="table.ecore#//TableControl/addRemoveDisabled"/>
+        <changes xsi:type="history:Set" xmi:id="_p0FfhB96Eeemy-pWGWHIRA" featureName="name" dataValue="addRemoveDisabled">
+          <element href="table.ecore#//TableControl/addRemoveDisabled"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0FfhR96Eeemy-pWGWHIRA" featureName="lowerBound" dataValue="1" oldDataValue="0">
+          <element href="table.ecore#//TableControl/addRemoveDisabled"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0Ffhh96Eeemy-pWGWHIRA" featureName="defaultValueLiteral" dataValue="false">
+          <element href="table.ecore#//TableControl/addRemoveDisabled"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0Ffhx96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//TableControl/addRemoveDisabled"/>
+          <referenceValue href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//TableControl" referenceName="eStructuralFeatures"
-          element="table.ecore#//TableControl/detailView">
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/detailView"
-            featureName="name" dataValue="detailView"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/detailView"
-            featureName="containment" dataValue="true" oldDataValue="false"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/detailView"
-            featureName="eType" referenceValue="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//View"/>
+      <changes xsi:type="history:Create" xmi:id="_p0GGkB96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//TableControl"/>
+        <element href="table.ecore#//TableControl/detailView"/>
+        <changes xsi:type="history:Set" xmi:id="_p0GGkR96Eeemy-pWGWHIRA" featureName="name" dataValue="detailView">
+          <element href="table.ecore#//TableControl/detailView"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGkh96Eeemy-pWGWHIRA" featureName="containment" dataValue="true" oldDataValue="false">
+          <element href="table.ecore#//TableControl/detailView"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGkx96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//TableControl/detailView"/>
+          <referenceValue href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//View"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//TableControl" referenceName="eStructuralFeatures"
-          element="table.ecore#//TableControl/enableDetailEditingDialog">
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/enableDetailEditingDialog"
-            featureName="name" dataValue="enableDetailEditingDialog"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/enableDetailEditingDialog"
-            featureName="defaultValueLiteral" dataValue="false"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/enableDetailEditingDialog"
-            featureName="eType" referenceValue="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+      <changes xsi:type="history:Create" xmi:id="_p0GGlB96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//TableControl"/>
+        <element href="table.ecore#//TableControl/enableDetailEditingDialog"/>
+        <changes xsi:type="history:Set" xmi:id="_p0GGlR96Eeemy-pWGWHIRA" featureName="name" dataValue="enableDetailEditingDialog">
+          <element href="table.ecore#//TableControl/enableDetailEditingDialog"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGlh96Eeemy-pWGWHIRA" featureName="defaultValueLiteral" dataValue="false">
+          <element href="table.ecore#//TableControl/enableDetailEditingDialog"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGlx96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//TableControl/enableDetailEditingDialog"/>
+          <referenceValue href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#/" referenceName="eClassifiers"
-          element="table.ecore#//TableColumnConfiguration">
-        <changes xsi:type="history:Set" element="table.ecore#//TableColumnConfiguration"
-            featureName="name" dataValue="TableColumnConfiguration"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableColumnConfiguration"
-            featureName="abstract" dataValue="true" oldDataValue="false"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableColumnConfiguration"
-            featureName="interface" dataValue="true" oldDataValue="false"/>
+      <changes xsi:type="history:Create" xmi:id="_p0GGmB96Eeemy-pWGWHIRA" referenceName="eClassifiers">
+        <target href="table.ecore#/"/>
+        <element href="table.ecore#//TableColumnConfiguration"/>
+        <changes xsi:type="history:Set" xmi:id="_p0GGmR96Eeemy-pWGWHIRA" featureName="name" dataValue="TableColumnConfiguration">
+          <element href="table.ecore#//TableColumnConfiguration"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGmh96Eeemy-pWGWHIRA" featureName="abstract" dataValue="true" oldDataValue="false">
+          <element href="table.ecore#//TableColumnConfiguration"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGmx96Eeemy-pWGWHIRA" featureName="interface" dataValue="true" oldDataValue="false">
+          <element href="table.ecore#//TableColumnConfiguration"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//TableControl" referenceName="eStructuralFeatures"
-          element="table.ecore#//TableControl/columnConfigurations">
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/columnConfigurations"
-            featureName="name" dataValue="columnConfigurations"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/columnConfigurations"
-            featureName="upperBound" dataValue="-1" oldDataValue="1"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/columnConfigurations"
-            featureName="containment" dataValue="true" oldDataValue="false"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/columnConfigurations"
-            featureName="eType" referenceValue="table.ecore#//TableColumnConfiguration"/>
+      <changes xsi:type="history:Create" xmi:id="_p0GGnB96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//TableControl"/>
+        <element href="table.ecore#//TableControl/columnConfigurations"/>
+        <changes xsi:type="history:Set" xmi:id="_p0GGnR96Eeemy-pWGWHIRA" featureName="name" dataValue="columnConfigurations">
+          <element href="table.ecore#//TableControl/columnConfigurations"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGnh96Eeemy-pWGWHIRA" featureName="upperBound" dataValue="-1" oldDataValue="1">
+          <element href="table.ecore#//TableControl/columnConfigurations"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGnx96Eeemy-pWGWHIRA" featureName="containment" dataValue="true" oldDataValue="false">
+          <element href="table.ecore#//TableControl/columnConfigurations"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0GGoB96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//TableControl/columnConfigurations"/>
+          <referenceValue href="table.ecore#//TableColumnConfiguration"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#/" referenceName="eClassifiers"
-          element="table.ecore#//TableDomainModelReference">
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference"
-            featureName="name" dataValue="TableDomainModelReference"/>
-        <changes xsi:type="history:Add" element="table.ecore#//TableDomainModelReference"
-            featureName="eSuperTypes" referenceValue="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//FeaturePathDomainModelReference"/>
+      <changes xsi:type="history:Create" xmi:id="_p0GGoR96Eeemy-pWGWHIRA" referenceName="eClassifiers">
+        <target href="table.ecore#/"/>
+        <element href="table.ecore#//TableDomainModelReference"/>
+        <changes xsi:type="history:Set" xmi:id="_p0GGoh96Eeemy-pWGWHIRA" featureName="name" dataValue="TableDomainModelReference">
+          <element href="table.ecore#//TableDomainModelReference"/>
+        </changes>
+        <changes xsi:type="history:Add" xmi:id="_p0GGox96Eeemy-pWGWHIRA" featureName="eSuperTypes">
+          <element href="table.ecore#//TableDomainModelReference"/>
+          <referenceValue href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//FeaturePathDomainModelReference"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//TableDomainModelReference"
-          referenceName="eStructuralFeatures" element="table.ecore#//TableDomainModelReference/columnDomainModelReferences">
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/columnDomainModelReferences"
-            featureName="name" dataValue="columnDomainModelReferences"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/columnDomainModelReferences"
-            featureName="upperBound" dataValue="-1" oldDataValue="1"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/columnDomainModelReferences"
-            featureName="containment" dataValue="true" oldDataValue="false"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/columnDomainModelReferences"
-            featureName="eType" referenceValue="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+      <changes xsi:type="history:Create" xmi:id="_p0GGpB96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//TableDomainModelReference"/>
+        <element href="table.ecore#//TableDomainModelReference/columnDomainModelReferences"/>
+        <changes xsi:type="history:Set" xmi:id="_p0QeoB96Eeemy-pWGWHIRA" featureName="name" dataValue="columnDomainModelReferences">
+          <element href="table.ecore#//TableDomainModelReference/columnDomainModelReferences"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0QeoR96Eeemy-pWGWHIRA" featureName="upperBound" dataValue="-1" oldDataValue="1">
+          <element href="table.ecore#//TableDomainModelReference/columnDomainModelReferences"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0Qeoh96Eeemy-pWGWHIRA" featureName="containment" dataValue="true" oldDataValue="false">
+          <element href="table.ecore#//TableDomainModelReference/columnDomainModelReferences"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0Qeox96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//TableDomainModelReference/columnDomainModelReferences"/>
+          <referenceValue href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#/" referenceName="eClassifiers"
-          element="table.ecore#//ReadOnlyColumnConfiguration">
-        <changes xsi:type="history:Set" element="table.ecore#//ReadOnlyColumnConfiguration"
-            featureName="name" dataValue="ReadOnlyColumnConfiguration"/>
-        <changes xsi:type="history:Add" element="table.ecore#//ReadOnlyColumnConfiguration"
-            featureName="eSuperTypes" referenceValue="table.ecore#//TableColumnConfiguration"/>
+      <changes xsi:type="history:Create" xmi:id="_p0QepB96Eeemy-pWGWHIRA" referenceName="eClassifiers">
+        <target href="table.ecore#/"/>
+        <element href="table.ecore#//ReadOnlyColumnConfiguration"/>
+        <changes xsi:type="history:Set" xmi:id="_p0QepR96Eeemy-pWGWHIRA" featureName="name" dataValue="ReadOnlyColumnConfiguration">
+          <element href="table.ecore#//ReadOnlyColumnConfiguration"/>
+        </changes>
+        <changes xsi:type="history:Add" xmi:id="_p0Qeph96Eeemy-pWGWHIRA" featureName="eSuperTypes">
+          <element href="table.ecore#//ReadOnlyColumnConfiguration"/>
+          <referenceValue href="table.ecore#//TableColumnConfiguration"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//ReadOnlyColumnConfiguration"
-          referenceName="eStructuralFeatures" element="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences">
-        <changes xsi:type="history:Set" element="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"
-            featureName="name" dataValue="columnDomainReferences"/>
-        <changes xsi:type="history:Set" element="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"
-            featureName="upperBound" dataValue="-1" oldDataValue="1"/>
-        <changes xsi:type="history:Set" element="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"
-            featureName="eType" referenceValue="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+      <changes xsi:type="history:Create" xmi:id="_p0Qepx96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//ReadOnlyColumnConfiguration"/>
+        <element href="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"/>
+        <changes xsi:type="history:Set" xmi:id="_p0QeqB96Eeemy-pWGWHIRA" featureName="name" dataValue="columnDomainReferences">
+          <element href="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0QeqR96Eeemy-pWGWHIRA" featureName="upperBound" dataValue="-1" oldDataValue="1">
+          <element href="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0Qeqh96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//ReadOnlyColumnConfiguration/columnDomainReferences"/>
+          <referenceValue href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#/" referenceName="eClassifiers"
-          element="table.ecore#//DetailEditing">
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing" featureName="name"
-            dataValue="DetailEditing"/>
+      <changes xsi:type="history:Create" xmi:id="_p0Qeqx96Eeemy-pWGWHIRA" referenceName="eClassifiers">
+        <target href="table.ecore#/"/>
+        <element href="table.ecore#//DetailEditing"/>
+        <changes xsi:type="history:Set" xmi:id="_p0QerB96Eeemy-pWGWHIRA" featureName="name" dataValue="DetailEditing">
+          <element href="table.ecore#//DetailEditing"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//TableControl" referenceName="eStructuralFeatures"
-          element="table.ecore#//TableControl/detailEditing">
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/detailEditing"
-            featureName="name" dataValue="detailEditing"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/detailEditing"
-            featureName="lowerBound" dataValue="1" oldDataValue="0"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/detailEditing"
-            featureName="defaultValueLiteral" dataValue="None"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableControl/detailEditing"
-            featureName="eType" referenceValue="table.ecore#//DetailEditing"/>
+      <changes xsi:type="history:Create" xmi:id="_p0QerR96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//TableControl"/>
+        <element href="table.ecore#//TableControl/detailEditing"/>
+        <changes xsi:type="history:Set" xmi:id="_p0Qerh96Eeemy-pWGWHIRA" featureName="name" dataValue="detailEditing">
+          <element href="table.ecore#//TableControl/detailEditing"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0Qerx96Eeemy-pWGWHIRA" featureName="lowerBound" dataValue="1" oldDataValue="0">
+          <element href="table.ecore#//TableControl/detailEditing"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0QesB96Eeemy-pWGWHIRA" featureName="defaultValueLiteral" dataValue="None">
+          <element href="table.ecore#//TableControl/detailEditing"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0QesR96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//TableControl/detailEditing"/>
+          <referenceValue href="table.ecore#//DetailEditing"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//DetailEditing" referenceName="eLiterals"
-          element="table.ecore#//DetailEditing/None">
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/None"
-            featureName="name" dataValue="None"/>
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/None"
-            featureName="literal" dataValue="None"/>
+      <changes xsi:type="history:Create" xmi:id="_p0Qesh96Eeemy-pWGWHIRA" referenceName="eLiterals">
+        <target href="table.ecore#//DetailEditing"/>
+        <element href="table.ecore#//DetailEditing/None"/>
+        <changes xsi:type="history:Set" xmi:id="_p0Qesx96Eeemy-pWGWHIRA" featureName="name" dataValue="None">
+          <element href="table.ecore#//DetailEditing/None"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0QetB96Eeemy-pWGWHIRA" featureName="literal" dataValue="None">
+          <element href="table.ecore#//DetailEditing/None"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//DetailEditing" referenceName="eLiterals"
-          element="table.ecore#//DetailEditing/WithDialog">
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/WithDialog"
-            featureName="name" dataValue="WithDialog"/>
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/WithDialog"
-            featureName="value" dataValue="1" oldDataValue="0"/>
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/WithDialog"
-            featureName="literal" dataValue="WithDialog"/>
+      <changes xsi:type="history:Create" xmi:id="_p0QetR96Eeemy-pWGWHIRA" referenceName="eLiterals">
+        <target href="table.ecore#//DetailEditing"/>
+        <element href="table.ecore#//DetailEditing/WithDialog"/>
+        <changes xsi:type="history:Set" xmi:id="_p0RFsB96Eeemy-pWGWHIRA" featureName="name" dataValue="WithDialog">
+          <element href="table.ecore#//DetailEditing/WithDialog"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0RFsR96Eeemy-pWGWHIRA" featureName="value" dataValue="1" oldDataValue="0">
+          <element href="table.ecore#//DetailEditing/WithDialog"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0RFsh96Eeemy-pWGWHIRA" featureName="literal" dataValue="WithDialog">
+          <element href="table.ecore#//DetailEditing/WithDialog"/>
+        </changes>
       </changes>
-      <changes xsi:type="history:Create" target="table.ecore#//DetailEditing" referenceName="eLiterals"
-          element="table.ecore#//DetailEditing/WithPanel">
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/WithPanel"
-            featureName="name" dataValue="WithPanel"/>
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/WithPanel"
-            featureName="value" dataValue="2" oldDataValue="0"/>
-        <changes xsi:type="history:Set" element="table.ecore#//DetailEditing/WithPanel"
-            featureName="literal" dataValue="WithPanel"/>
+      <changes xsi:type="history:Create" xmi:id="_p0RFsx96Eeemy-pWGWHIRA" referenceName="eLiterals">
+        <target href="table.ecore#//DetailEditing"/>
+        <element href="table.ecore#//DetailEditing/WithPanel"/>
+        <changes xsi:type="history:Set" xmi:id="_p0RFtB96Eeemy-pWGWHIRA" featureName="name" dataValue="WithPanel">
+          <element href="table.ecore#//DetailEditing/WithPanel"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0RFtR96Eeemy-pWGWHIRA" featureName="value" dataValue="2" oldDataValue="0">
+          <element href="table.ecore#//DetailEditing/WithPanel"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0RFth96Eeemy-pWGWHIRA" featureName="literal" dataValue="WithPanel">
+          <element href="table.ecore#//DetailEditing/WithPanel"/>
+        </changes>
       </changes>
     </changes>
-    <changes xsi:type="history:OperationChange">
-      <changes xsi:type="history:Create" target="table.ecore#//TableDomainModelReference"
-          referenceName="eStructuralFeatures" element="table.ecore#//TableDomainModelReference/domainModelReference">
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/domainModelReference"
-            featureName="name" dataValue="domainModelReference"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/domainModelReference"
-            featureName="containment" dataValue="true" oldDataValue="false"/>
-        <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/domainModelReference"
-            featureName="eType" referenceValue="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+    <changes xsi:type="history:OperationChange" xmi:id="_p0UwEB96Eeemy-pWGWHIRA">
+      <changes xsi:type="history:Create" xmi:id="_p0UwER96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//TableDomainModelReference"/>
+        <element href="table.ecore#//TableDomainModelReference/domainModelReference"/>
+        <changes xsi:type="history:Set" xmi:id="_p0UwEh96Eeemy-pWGWHIRA" featureName="name" dataValue="domainModelReference">
+          <element href="table.ecore#//TableDomainModelReference/domainModelReference"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0UwEx96Eeemy-pWGWHIRA" featureName="containment" dataValue="true" oldDataValue="false">
+          <element href="table.ecore#//TableDomainModelReference/domainModelReference"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0UwFB96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//TableDomainModelReference/domainModelReference"/>
+          <referenceValue href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+        </changes>
       </changes>
-      <operation name="newReference">
-        <parameters name="eClass">
-          <referenceValue element="table.ecore#//TableDomainModelReference"/>
+      <operation xmi:id="_p0fvMB96Eeemy-pWGWHIRA" name="newReference">
+        <parameters xmi:id="_p0hkYB96Eeemy-pWGWHIRA" name="eClass">
+          <referenceValue xmi:id="_p0iLcB96Eeemy-pWGWHIRA">
+            <element href="table.ecore#//TableDomainModelReference"/>
+          </referenceValue>
         </parameters>
-        <parameters name="name">
+        <parameters xmi:id="_p0iLcR96Eeemy-pWGWHIRA" name="name">
           <dataValue>domainModelReference</dataValue>
         </parameters>
-        <parameters name="type">
-          <referenceValue element="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+        <parameters xmi:id="_p0iLch96Eeemy-pWGWHIRA" name="type">
+          <referenceValue xmi:id="_p0iLcx96Eeemy-pWGWHIRA">
+            <element href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+          </referenceValue>
         </parameters>
-        <parameters name="lowerBound">
+        <parameters xmi:id="_p0iLdB96Eeemy-pWGWHIRA" name="lowerBound">
           <dataValue>0</dataValue>
         </parameters>
-        <parameters name="upperBound">
+        <parameters xmi:id="_p0iLdR96Eeemy-pWGWHIRA" name="upperBound">
           <dataValue>1</dataValue>
         </parameters>
-        <parameters name="containment">
+        <parameters xmi:id="_p0iLdh96Eeemy-pWGWHIRA" name="containment">
           <dataValue>true</dataValue>
         </parameters>
-        <parameters name="opposite"/>
+        <parameters xmi:id="_p0iLdx96Eeemy-pWGWHIRA" name="opposite"/>
       </operation>
     </changes>
-    <changes xsi:type="history:CompositeChange">
-      <changes xsi:type="history:Create" target="table.ecore#//TableDomainModelReference"
-          referenceName="eAnnotations" element="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%"/>
-      <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%"
-          featureName="source" dataValue="http://www.eclipse.org/emf/2002/Ecore"/>
-      <changes xsi:type="history:Create" target="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%"
-          referenceName="details" element="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%/@details.0"/>
-      <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%/@details.0"
-          featureName="key" dataValue="constraints"/>
-      <changes xsi:type="history:Set" element="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%/@details.0"
-          featureName="value" dataValue="resolveable"/>
+    <changes xsi:type="history:CompositeChange" xmi:id="_p0iLeB96Eeemy-pWGWHIRA">
+      <changes xsi:type="history:Create" xmi:id="_p0iLeR96Eeemy-pWGWHIRA" referenceName="eAnnotations">
+        <target href="table.ecore#//TableDomainModelReference"/>
+        <element href="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%"/>
+      </changes>
+      <changes xsi:type="history:Set" xmi:id="_p0iLeh96Eeemy-pWGWHIRA" featureName="source" dataValue="http://www.eclipse.org/emf/2002/Ecore">
+        <element href="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%"/>
+      </changes>
+      <changes xsi:type="history:Create" xmi:id="_p0iLex96Eeemy-pWGWHIRA" referenceName="details">
+        <target href="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%"/>
+        <element href="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%/@details.0"/>
+      </changes>
+      <changes xsi:type="history:Set" xmi:id="_p0iLfB96Eeemy-pWGWHIRA" featureName="key" dataValue="constraints">
+        <element href="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%/@details.0"/>
+      </changes>
+      <changes xsi:type="history:Set" xmi:id="_p0iLfR96Eeemy-pWGWHIRA" featureName="value" dataValue="resolveable">
+        <element href="table.ecore#//TableDomainModelReference/%http:%2F%2Fwww.eclipse.org%2Femf%2F2002%2FEcore%/@details.0"/>
+      </changes>
     </changes>
   </releases>
-  <releases date="2014-10-23T15:19:11.006+0200" label="150">
-    <changes xsi:type="history:MigrationChange" migration="org.eclipse.emf.ecp.view.table.edapt._140to150.AddedDMRToTableDMRMigration"/>
-    <changes xsi:type="history:Set" element="table.ecore#/" featureName="nsURI" dataValue="http://org/eclipse/emf/ecp/view/table/model/150"
-        oldDataValue="http://org/eclipse/emf/ecp/view/table/model"/>
+  <releases xmi:id="_p0iLfh96Eeemy-pWGWHIRA" date="2014-10-23T15:19:11.006+0200" label="150">
+    <changes xsi:type="history:MigrationChange" xmi:id="_p0kAoB96Eeemy-pWGWHIRA" migration="org.eclipse.emf.ecp.view.table.edapt._140to150.AddedDMRToTableDMRMigration"/>
+    <changes xsi:type="history:Set" xmi:id="_p0kAoR96Eeemy-pWGWHIRA" featureName="nsURI" dataValue="http://org/eclipse/emf/ecp/view/table/model/150" oldDataValue="http://org/eclipse/emf/ecp/view/table/model">
+      <element href="table.ecore#/"/>
+    </changes>
   </releases>
-  <releases>
-    <changes xsi:type="history:OperationChange">
-      <changes xsi:type="history:Create" target="table.ecore#/" referenceName="eClassifiers"
-          element="table.ecore#//WidthConfiguration">
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration"
-            featureName="name" dataValue="WidthConfiguration"/>
-        <changes xsi:type="history:Add" element="table.ecore#//WidthConfiguration"
-            featureName="eSuperTypes" referenceValue="table.ecore#//TableColumnConfiguration"/>
+  <releases xmi:id="_p0kAoh96Eeemy-pWGWHIRA">
+    <changes xsi:type="history:OperationChange" xmi:id="_p0kAox96Eeemy-pWGWHIRA">
+      <changes xsi:type="history:Create" xmi:id="_p0kApB96Eeemy-pWGWHIRA" referenceName="eClassifiers">
+        <target href="table.ecore#/"/>
+        <element href="table.ecore#//WidthConfiguration"/>
+        <changes xsi:type="history:Set" xmi:id="_p0kApR96Eeemy-pWGWHIRA" featureName="name" dataValue="WidthConfiguration">
+          <element href="table.ecore#//WidthConfiguration"/>
+        </changes>
+        <changes xsi:type="history:Add" xmi:id="_p0kAph96Eeemy-pWGWHIRA" featureName="eSuperTypes">
+          <element href="table.ecore#//WidthConfiguration"/>
+          <referenceValue href="table.ecore#//TableColumnConfiguration"/>
+        </changes>
       </changes>
-      <operation name="newClass">
-        <parameters name="ePackage">
-          <referenceValue element="table.ecore#/"/>
+      <operation xmi:id="_p0kApx96Eeemy-pWGWHIRA" name="newClass">
+        <parameters xmi:id="_p0kAqB96Eeemy-pWGWHIRA" name="ePackage">
+          <referenceValue xmi:id="_p0kAqR96Eeemy-pWGWHIRA">
+            <element href="table.ecore#/"/>
+          </referenceValue>
         </parameters>
-        <parameters name="name">
+        <parameters xmi:id="_p0kAqh96Eeemy-pWGWHIRA" name="name">
           <dataValue>WidthConfiguration</dataValue>
         </parameters>
-        <parameters name="superClasses">
-          <referenceValue element="table.ecore#//TableColumnConfiguration"/>
+        <parameters xmi:id="_p0kAqx96Eeemy-pWGWHIRA" name="superClasses">
+          <referenceValue xmi:id="_p0kArB96Eeemy-pWGWHIRA">
+            <element href="table.ecore#//TableColumnConfiguration"/>
+          </referenceValue>
         </parameters>
-        <parameters name="abstr">
+        <parameters xmi:id="_p0kArR96Eeemy-pWGWHIRA" name="abstr">
           <dataValue>false</dataValue>
         </parameters>
       </operation>
     </changes>
-    <changes xsi:type="history:OperationChange">
-      <changes xsi:type="history:Create" target="table.ecore#//WidthConfiguration"
-          referenceName="eStructuralFeatures" element="table.ecore#//WidthConfiguration/columnDomainReference">
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/columnDomainReference"
-            featureName="name" dataValue="columnDomainReference"/>
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/columnDomainReference"
-            featureName="lowerBound" dataValue="1" oldDataValue="0"/>
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/columnDomainReference"
-            featureName="eType" referenceValue="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+    <changes xsi:type="history:OperationChange" xmi:id="_p0kArh96Eeemy-pWGWHIRA">
+      <changes xsi:type="history:Create" xmi:id="_p0kArx96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//WidthConfiguration"/>
+        <element href="table.ecore#//WidthConfiguration/columnDomainReference"/>
+        <changes xsi:type="history:Set" xmi:id="_p0kAsB96Eeemy-pWGWHIRA" featureName="name" dataValue="columnDomainReference">
+          <element href="table.ecore#//WidthConfiguration/columnDomainReference"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0kAsR96Eeemy-pWGWHIRA" featureName="lowerBound" dataValue="1" oldDataValue="0">
+          <element href="table.ecore#//WidthConfiguration/columnDomainReference"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0knsB96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//WidthConfiguration/columnDomainReference"/>
+          <referenceValue href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+        </changes>
       </changes>
-      <operation name="newReference">
-        <parameters name="eClass">
-          <referenceValue element="table.ecore#//WidthConfiguration"/>
+      <operation xmi:id="_p0knsR96Eeemy-pWGWHIRA" name="newReference">
+        <parameters xmi:id="_p0knsh96Eeemy-pWGWHIRA" name="eClass">
+          <referenceValue xmi:id="_p0knsx96Eeemy-pWGWHIRA">
+            <element href="table.ecore#//WidthConfiguration"/>
+          </referenceValue>
         </parameters>
-        <parameters name="name">
+        <parameters xmi:id="_p0kntB96Eeemy-pWGWHIRA" name="name">
           <dataValue>columnDomainReference</dataValue>
         </parameters>
-        <parameters name="type">
-          <referenceValue element="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+        <parameters xmi:id="_p0kntR96Eeemy-pWGWHIRA" name="type">
+          <referenceValue xmi:id="_p0knth96Eeemy-pWGWHIRA">
+            <element href="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
+          </referenceValue>
         </parameters>
-        <parameters name="lowerBound">
+        <parameters xmi:id="_p0kntx96Eeemy-pWGWHIRA" name="lowerBound">
           <dataValue>1</dataValue>
         </parameters>
-        <parameters name="upperBound">
+        <parameters xmi:id="_p0knuB96Eeemy-pWGWHIRA" name="upperBound">
           <dataValue>1</dataValue>
         </parameters>
-        <parameters name="containment">
+        <parameters xmi:id="_p0knuR96Eeemy-pWGWHIRA" name="containment">
           <dataValue>false</dataValue>
         </parameters>
-        <parameters name="opposite"/>
+        <parameters xmi:id="_p0knuh96Eeemy-pWGWHIRA" name="opposite"/>
       </operation>
     </changes>
-    <changes xsi:type="history:OperationChange">
-      <changes xsi:type="history:Create" target="table.ecore#//WidthConfiguration"
-          referenceName="eStructuralFeatures" element="table.ecore#//WidthConfiguration/weight">
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/weight"
-            featureName="name" dataValue="weight"/>
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/weight"
-            featureName="lowerBound" dataValue="1" oldDataValue="0"/>
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/weight"
-            featureName="defaultValueLiteral" dataValue="100"/>
-        <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/weight"
-            featureName="eType" referenceValue="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <changes xsi:type="history:OperationChange" xmi:id="_p0knux96Eeemy-pWGWHIRA">
+      <changes xsi:type="history:Create" xmi:id="_p0knvB96Eeemy-pWGWHIRA" referenceName="eStructuralFeatures">
+        <target href="table.ecore#//WidthConfiguration"/>
+        <element href="table.ecore#//WidthConfiguration/weight"/>
+        <changes xsi:type="history:Set" xmi:id="_p0knvR96Eeemy-pWGWHIRA" featureName="name" dataValue="weight">
+          <element href="table.ecore#//WidthConfiguration/weight"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0knvh96Eeemy-pWGWHIRA" featureName="lowerBound" dataValue="1" oldDataValue="0">
+          <element href="table.ecore#//WidthConfiguration/weight"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0knvx96Eeemy-pWGWHIRA" featureName="defaultValueLiteral" dataValue="100">
+          <element href="table.ecore#//WidthConfiguration/weight"/>
+        </changes>
+        <changes xsi:type="history:Set" xmi:id="_p0knwB96Eeemy-pWGWHIRA" featureName="eType">
+          <element href="table.ecore#//WidthConfiguration/weight"/>
+          <referenceValue href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+        </changes>
       </changes>
-      <operation name="newAttribute">
-        <parameters name="eClass">
-          <referenceValue element="table.ecore#//WidthConfiguration"/>
+      <operation xmi:id="_p0knwR96Eeemy-pWGWHIRA" name="newAttribute">
+        <parameters xmi:id="_p0knwh96Eeemy-pWGWHIRA" name="eClass">
+          <referenceValue xmi:id="_p0knwx96Eeemy-pWGWHIRA">
+            <element href="table.ecore#//WidthConfiguration"/>
+          </referenceValue>
         </parameters>
-        <parameters name="name">
+        <parameters xmi:id="_p0knxB96Eeemy-pWGWHIRA" name="name">
           <dataValue>weight</dataValue>
         </parameters>
-        <parameters name="type">
-          <referenceValue element="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+        <parameters xmi:id="_p0knxR96Eeemy-pWGWHIRA" name="type">
+          <referenceValue xmi:id="_p0knxh96Eeemy-pWGWHIRA">
+            <element href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+          </referenceValue>
         </parameters>
-        <parameters name="lowerBound">
+        <parameters xmi:id="_p0knxx96Eeemy-pWGWHIRA" name="lowerBound">
           <dataValue>1</dataValue>
         </parameters>
-        <parameters name="upperBound">
+        <parameters xmi:id="_p0knyB96Eeemy-pWGWHIRA" name="upperBound">
           <dataValue>1</dataValue>
         </parameters>
-        <parameters name="defaultValue">
+        <parameters xmi:id="_p0knyR96Eeemy-pWGWHIRA" name="defaultValue">
           <dataValue>100</dataValue>
         </parameters>
       </operation>
     </changes>
-    <changes xsi:type="history:Set" element="table.ecore#//WidthConfiguration/weight"
-        featureName="eType" referenceValue="http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        oldReferenceValue="http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <changes xsi:type="history:Set" xmi:id="_p0knyh96Eeemy-pWGWHIRA" featureName="eType">
+      <element href="table.ecore#//WidthConfiguration/weight"/>
+      <referenceValue href="http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+      <oldReferenceValue href="http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    </changes>
+    <changes xsi:type="history:Set" xmi:id="_sQhswB96Eeemy-pWGWHIRA" featureName="name" dataValue="columnDomainReference" oldDataValue="columnDomainModelReference">
+      <element href="table.ecore#//SingleColumnConfiguration/columnDomainReference"/>
+    </changes>
   </releases>
 </history:History>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml
index 6359595664..b2d8b0cb83 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.table.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VEnablementConfiguration.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VEnablementConfiguration.java
new file mode 100644
index 0000000000..a1cebbc406
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VEnablementConfiguration.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.table.model;
+
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Enablement Configuration</b></em>'.
+ *
+ * @since 1.13
+ *        <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getEnablementConfiguration()
+ * @model
+ * @generated
+ */
+public interface VEnablementConfiguration extends VElement, VSingleColumnConfiguration {
+
+} // VEnablementConfiguration
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VSingleColumnConfiguration.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VSingleColumnConfiguration.java
new file mode 100644
index 0000000000..2731f41a78
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VSingleColumnConfiguration.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.table.model;
+
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Single Column Configuration</b></em>'.
+ *
+ * @since 1.13
+ *
+ *        <!-- end-user-doc -->
+ *
+ *        <p>
+ *        The following features are supported:
+ *        </p>
+ *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration#getColumnDomainReference
+ *        <em>Column Domain Reference</em>}</li>
+ *        </ul>
+ *
+ * @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getSingleColumnConfiguration()
+ * @model interface="true" abstract="true"
+ * @generated
+ */
+public interface VSingleColumnConfiguration extends VTableColumnConfiguration {
+	/**
+	 * Returns the value of the '<em><b>Column Domain Reference</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Column Domain Reference</em>' reference isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Column Domain Reference</em>' reference.
+	 * @see #setColumnDomainReference(VDomainModelReference)
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getSingleColumnConfiguration_ColumnDomainReference()
+	 * @model required="true"
+	 * @generated
+	 */
+	VDomainModelReference getColumnDomainReference();
+
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration#getColumnDomainReference <em>Column
+	 * Domain Reference</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value the new value of the '<em>Column Domain Reference</em>' reference.
+	 * @see #getColumnDomainReference()
+	 * @generated
+	 */
+	void setColumnDomainReference(VDomainModelReference value);
+
+} // VSingleColumnConfiguration
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java
index a8a9b88e5e..04b7f3b440 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java
@@ -26,6 +26,8 @@ import org.eclipse.emf.ecp.view.spi.model.VView;
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isAddRemoveDisabled <em>Add Remove
  * Disabled</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isMoveUpDownDisabled <em>Move Up Down
+ * Disabled</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getColumnConfigurations <em>Column
  * Configurations</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailEditing <em>Detail Editing</em>}</li>
@@ -70,6 +72,36 @@ public interface VTableControl extends VControl {
 	void setAddRemoveDisabled(boolean value);
 
 	/**
+	 * Returns the value of the '<em><b>Move Up Down Disabled</b></em>' attribute.
+	 * The default value is <code>"true"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Move Up Down Disabled</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the value of the '<em>Move Up Down Disabled</em>' attribute.
+	 * @see #setMoveUpDownDisabled(boolean)
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getTableControl_MoveUpDownDisabled()
+	 * @model default="true" required="true"
+	 * @generated
+	 */
+	boolean isMoveUpDownDisabled();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isMoveUpDownDisabled
+	 * <em>Move Up Down Disabled</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value the new value of the '<em>Move Up Down Disabled</em>' attribute.
+	 * @see #isMoveUpDownDisabled()
+	 * @generated
+	 */
+	void setMoveUpDownDisabled(boolean value);
+
+	/**
 	 * Returns the value of the '<em><b>Column Configurations</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration}.
 	 * <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableFactory.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableFactory.java
index edae15cd03..ab452fd9ff 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableFactory.java
@@ -74,6 +74,17 @@ public interface VTableFactory extends EFactory {
 	VWidthConfiguration createWidthConfiguration();
 
 	/**
+	 * Returns a new object of class '<em>Enablement Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return a new object of class '<em>Enablement Configuration</em>'.
+	 * @generated
+	 */
+	VEnablementConfiguration createEnablementConfiguration();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java
index 83583306e3..6f55c2a14a 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java
@@ -196,6 +196,16 @@ public interface VTablePackage extends EPackage {
 	int TABLE_CONTROL__ADD_REMOVE_DISABLED = VViewPackage.CONTROL_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Move Up Down Disabled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_CONTROL__MOVE_UP_DOWN_DISABLED = VViewPackage.CONTROL_FEATURE_COUNT + 1;
+
+	/**
 	 * The feature id for the '<em><b>Column Configurations</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -203,7 +213,7 @@ public interface VTablePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_CONTROL__COLUMN_CONFIGURATIONS = VViewPackage.CONTROL_FEATURE_COUNT + 1;
+	int TABLE_CONTROL__COLUMN_CONFIGURATIONS = VViewPackage.CONTROL_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Detail Editing</b></em>' attribute.
@@ -213,7 +223,7 @@ public interface VTablePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_CONTROL__DETAIL_EDITING = VViewPackage.CONTROL_FEATURE_COUNT + 2;
+	int TABLE_CONTROL__DETAIL_EDITING = VViewPackage.CONTROL_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Detail View</b></em>' containment reference.
@@ -223,7 +233,7 @@ public interface VTablePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_CONTROL__DETAIL_VIEW = VViewPackage.CONTROL_FEATURE_COUNT + 3;
+	int TABLE_CONTROL__DETAIL_VIEW = VViewPackage.CONTROL_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Enable Detail Editing Dialog</b></em>' attribute.
@@ -233,7 +243,7 @@ public interface VTablePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_CONTROL__ENABLE_DETAIL_EDITING_DIALOG = VViewPackage.CONTROL_FEATURE_COUNT + 4;
+	int TABLE_CONTROL__ENABLE_DETAIL_EDITING_DIALOG = VViewPackage.CONTROL_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of structural features of the '<em>Control</em>' class.
@@ -243,7 +253,7 @@ public interface VTablePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_CONTROL_FEATURE_COUNT = VViewPackage.CONTROL_FEATURE_COUNT + 5;
+	int TABLE_CONTROL_FEATURE_COUNT = VViewPackage.CONTROL_FEATURE_COUNT + 6;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration <em>Column
@@ -344,6 +354,19 @@ public interface VTablePackage extends EPackage {
 	int TABLE_DOMAIN_MODEL_REFERENCE_FEATURE_COUNT = VViewPackage.FEATURE_PATH_DOMAIN_MODEL_REFERENCE_FEATURE_COUNT + 2;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration <em>Single
+	 * Column Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.impl.VTablePackageImpl#getSingleColumnConfiguration()
+	 * @generated
+	 */
+	int SINGLE_COLUMN_CONFIGURATION = 6;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VReadOnlyColumnConfigurationImpl
 	 * <em>Read Only Column Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
@@ -376,6 +399,28 @@ public interface VTablePackage extends EPackage {
 	int READ_ONLY_COLUMN_CONFIGURATION_FEATURE_COUNT = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>Column Domain Reference</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Single Column Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SINGLE_COLUMN_CONFIGURATION_FEATURE_COUNT = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 1;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl
 	 * <em>Width Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
@@ -391,13 +436,12 @@ public interface VTablePackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Column Domain Reference</b></em>' reference.
 	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
-	 * @since 1.9
-	 *        <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int WIDTH_CONFIGURATION__COLUMN_DOMAIN_REFERENCE = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 0;
+	int WIDTH_CONFIGURATION__COLUMN_DOMAIN_REFERENCE = SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE;
 
 	/**
 	 * The feature id for the '<em><b>Weight</b></em>' attribute.
@@ -408,7 +452,7 @@ public interface VTablePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int WIDTH_CONFIGURATION__WEIGHT = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 1;
+	int WIDTH_CONFIGURATION__WEIGHT = SINGLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Min Width</b></em>' attribute.
@@ -416,11 +460,10 @@ public interface VTablePackage extends EPackage {
 	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
-	int WIDTH_CONFIGURATION__MIN_WIDTH = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 2;
+	int WIDTH_CONFIGURATION__MIN_WIDTH = SINGLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 1;
 
 	/**
 	 * The number of structural features of the '<em>Width Configuration</em>' class.
@@ -431,7 +474,130 @@ public interface VTablePackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int WIDTH_CONFIGURATION_FEATURE_COUNT = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 3;
+	int WIDTH_CONFIGURATION_FEATURE_COUNT = SINGLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VEnablementConfigurationImpl
+	 * <em>Enablement Configuration</em>}' class.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.impl.VEnablementConfigurationImpl
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.impl.VTablePackageImpl#getEnablementConfiguration()
+	 * @generated
+	 */
+	int ENABLEMENT_CONFIGURATION = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__NAME = VViewPackage.ELEMENT__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Label</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__LABEL = VViewPackage.ELEMENT__LABEL;
+
+	/**
+	 * The feature id for the '<em><b>Visible</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__VISIBLE = VViewPackage.ELEMENT__VISIBLE;
+
+	/**
+	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__ENABLED = VViewPackage.ELEMENT__ENABLED;
+
+	/**
+	 * The feature id for the '<em><b>Readonly</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__READONLY = VViewPackage.ELEMENT__READONLY;
+
+	/**
+	 * The feature id for the '<em><b>Diagnostic</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__DIAGNOSTIC = VViewPackage.ELEMENT__DIAGNOSTIC;
+
+	/**
+	 * The feature id for the '<em><b>Attachments</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__ATTACHMENTS = VViewPackage.ELEMENT__ATTACHMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Uuid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__UUID = VViewPackage.ELEMENT__UUID;
+
+	/**
+	 * The feature id for the '<em><b>Column Domain Reference</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE = VViewPackage.ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Enablement Configuration</em>' class.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ENABLEMENT_CONFIGURATION_FEATURE_COUNT = VViewPackage.ELEMENT_FEATURE_COUNT + 1;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing <em>Detail
@@ -443,7 +609,7 @@ public interface VTablePackage extends EPackage {
 	 * @see org.eclipse.emf.ecp.view.spi.table.model.impl.VTablePackageImpl#getDetailEditing()
 	 * @generated
 	 */
-	int DETAIL_EDITING = 5;
+	int DETAIL_EDITING = 7;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl
@@ -472,6 +638,20 @@ public interface VTablePackage extends EPackage {
 	EAttribute getTableControl_AddRemoveDisabled();
 
 	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isMoveUpDownDisabled <em>Move Up Down
+	 * Disabled</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the meta object for the attribute '<em>Move Up Down Disabled</em>'.
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isMoveUpDownDisabled()
+	 * @see #getTableControl()
+	 * @generated
+	 */
+	EAttribute getTableControl_MoveUpDownDisabled();
+
+	/**
 	 * Returns the meta object for the containment reference list
 	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getColumnConfigurations <em>Column
 	 * Configurations</em>}'.
@@ -618,21 +798,6 @@ public interface VTablePackage extends EPackage {
 	EClass getWidthConfiguration();
 
 	/**
-	 * Returns the meta object for the reference
-	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference <em>Column Domain
-	 * Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 *
-	 * @since 1.9
-	 *        <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Column Domain Reference</em>'.
-	 * @see org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference()
-	 * @see #getWidthConfiguration()
-	 * @generated
-	 */
-	EReference getWidthConfiguration_ColumnDomainReference();
-
-	/**
 	 * Returns the meta object for the attribute
 	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getWeight <em>Weight</em>}'.
 	 * <!-- begin-user-doc -->
@@ -650,10 +815,9 @@ public interface VTablePackage extends EPackage {
 	 * Returns the meta object for the attribute
 	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth <em>Min Width</em>}'.
 	 * <!-- begin-user-doc -->
-	 * 
+	 *
 	 * @since 1.9
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the meta object for the attribute '<em>Min Width</em>'.
 	 * @see org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth()
 	 * @see #getWidthConfiguration()
@@ -662,6 +826,47 @@ public interface VTablePackage extends EPackage {
 	EAttribute getWidthConfiguration_MinWidth();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration
+	 * <em>Enablement Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Enablement Configuration</em>'.
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration
+	 * @generated
+	 */
+	EClass getEnablementConfiguration();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration
+	 * <em>Single Column Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Single Column Configuration</em>'.
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration
+	 * @generated
+	 */
+	EClass getSingleColumnConfiguration();
+
+	/**
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration#getColumnDomainReference <em>Column
+	 * Domain Reference</em>}'.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Column Domain Reference</em>'.
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration#getColumnDomainReference()
+	 * @see #getSingleColumnConfiguration()
+	 * @generated
+	 */
+	EReference getSingleColumnConfiguration_ColumnDomainReference();
+
+	/**
 	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing <em>Detail
 	 * Editing</em>}'.
 	 * <!-- begin-user-doc -->
@@ -719,6 +924,15 @@ public interface VTablePackage extends EPackage {
 		EAttribute TABLE_CONTROL__ADD_REMOVE_DISABLED = eINSTANCE.getTableControl_AddRemoveDisabled();
 
 		/**
+		 * The meta object literal for the '<em><b>Move Up Down Disabled</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 *
+		 * @generated
+		 */
+		EAttribute TABLE_CONTROL__MOVE_UP_DOWN_DISABLED = eINSTANCE.getTableControl_MoveUpDownDisabled();
+
+		/**
 		 * The meta object literal for the '<em><b>Column Configurations</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -838,36 +1052,62 @@ public interface VTablePackage extends EPackage {
 		EClass WIDTH_CONFIGURATION = eINSTANCE.getWidthConfiguration();
 
 		/**
-		 * The meta object literal for the '<em><b>Column Domain Reference</b></em>' reference feature.
+		 * The meta object literal for the '<em><b>Weight</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 *
 		 * @since 1.9
 		 *        <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference WIDTH_CONFIGURATION__COLUMN_DOMAIN_REFERENCE = eINSTANCE
-			.getWidthConfiguration_ColumnDomainReference();
+		EAttribute WIDTH_CONFIGURATION__WEIGHT = eINSTANCE.getWidthConfiguration_Weight();
 
 		/**
-		 * The meta object literal for the '<em><b>Weight</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Min Width</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 *
 		 * @since 1.9
 		 *        <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute WIDTH_CONFIGURATION__WEIGHT = eINSTANCE.getWidthConfiguration_Weight();
+		EAttribute WIDTH_CONFIGURATION__MIN_WIDTH = eINSTANCE.getWidthConfiguration_MinWidth();
 
 		/**
-		 * The meta object literal for the '<em><b>Min Width</b></em>' attribute feature.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VEnablementConfigurationImpl <em>Enablement
+		 * Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
-		 * 
-		 * @since 1.9
+		 *
+		 * @since 1.13
+		 *        <!-- end-user-doc -->
+		 * @see org.eclipse.emf.ecp.view.spi.table.model.impl.VEnablementConfigurationImpl
+		 * @see org.eclipse.emf.ecp.view.spi.table.model.impl.VTablePackageImpl#getEnablementConfiguration()
+		 * @generated
+		 */
+		EClass ENABLEMENT_CONFIGURATION = eINSTANCE.getEnablementConfiguration();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration
+		 * <em>Single Column Configuration</em>}' class.
+		 * <!-- begin-user-doc -->
+		 *
+		 * @since 1.13
 		 *        <!-- end-user-doc -->
+		 * @see org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration
+		 * @see org.eclipse.emf.ecp.view.spi.table.model.impl.VTablePackageImpl#getSingleColumnConfiguration()
+		 * @generated
+		 */
+		EClass SINGLE_COLUMN_CONFIGURATION = eINSTANCE.getSingleColumnConfiguration();
+
+		/**
+		 * The meta object literal for the '<em><b>Column Domain Reference</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
 		 *
+		 * @since 1.13
+		 *        <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute WIDTH_CONFIGURATION__MIN_WIDTH = eINSTANCE.getWidthConfiguration_MinWidth();
+		EReference SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE = eINSTANCE
+			.getSingleColumnConfiguration_ColumnDomainReference();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing <em>Detail
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java
index 9b47425d3b..2b3be22ba8 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java
@@ -11,8 +11,6 @@
  */
 package org.eclipse.emf.ecp.view.spi.table.model;
 
-import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Width Configuration</b></em>'.
@@ -24,8 +22,6 @@ import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
  *        The following features are supported:
  *        </p>
  *        <ul>
- *        <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference <em>Column
- *        Domain Reference</em>}</li>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getWeight <em>Weight</em>}</li>
  *        <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth <em>Min Width</em>}</li>
  *        </ul>
@@ -34,37 +30,7 @@ import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
  * @model
  * @generated
  */
-public interface VWidthConfiguration extends VTableColumnConfiguration {
-	/**
-	 * Returns the value of the '<em><b>Column Domain Reference</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Column Domain Reference</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Column Domain Reference</em>' reference.
-	 * @see #setColumnDomainReference(VDomainModelReference)
-	 * @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getWidthConfiguration_ColumnDomainReference()
-	 * @model required="true"
-	 * @generated
-	 */
-	VDomainModelReference getColumnDomainReference();
-
-	/**
-	 * Sets the value of the
-	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference <em>Column Domain
-	 * Reference</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value the new value of the '<em>Column Domain Reference</em>' reference.
-	 * @see #getColumnDomainReference()
-	 * @generated
-	 */
-	void setColumnDomainReference(VDomainModelReference value);
-
+public interface VWidthConfiguration extends VSingleColumnConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Weight</b></em>' attribute.
 	 * <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VEnablementConfigurationImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VEnablementConfigurationImpl.java
new file mode 100644
index 0000000000..cd5e9f652c
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VEnablementConfigurationImpl.java
@@ -0,0 +1,238 @@
+/**
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.spi.table.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.impl.VElementImpl;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Enablement Configuration</b></em>'.
+ *
+ * @since 1.13
+ *        <!-- end-user-doc -->
+ *        <p>
+ *        The following features are implemented:
+ *        </p>
+ *        <ul>
+ *        <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VEnablementConfigurationImpl#getColumnDomainReference
+ *        <em>Column Domain Reference</em>}</li>
+ *        </ul>
+ *
+ * @generated
+ */
+public class VEnablementConfigurationImpl extends VElementImpl implements VEnablementConfiguration {
+	/**
+	 * The cached value of the '{@link #getColumnDomainReference() <em>Column Domain Reference</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getColumnDomainReference()
+	 * @generated
+	 * @ordered
+	 */
+	protected VDomainModelReference columnDomainReference;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected VEnablementConfigurationImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return VTablePackage.Literals.ENABLEMENT_CONFIGURATION;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public VDomainModelReference getColumnDomainReference() {
+		if (columnDomainReference != null && columnDomainReference.eIsProxy()) {
+			final InternalEObject oldColumnDomainReference = (InternalEObject) columnDomainReference;
+			columnDomainReference = (VDomainModelReference) eResolveProxy(oldColumnDomainReference);
+			if (columnDomainReference != oldColumnDomainReference) {
+				if (eNotificationRequired()) {
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+						VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE, oldColumnDomainReference,
+						columnDomainReference));
+				}
+			}
+		}
+		return columnDomainReference;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public VDomainModelReference basicGetColumnDomainReference() {
+		return columnDomainReference;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setColumnDomainReference(VDomainModelReference newColumnDomainReference) {
+		final VDomainModelReference oldColumnDomainReference = columnDomainReference;
+		columnDomainReference = newColumnDomainReference;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET,
+				VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE, oldColumnDomainReference,
+				columnDomainReference));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE:
+			if (resolve) {
+				return getColumnDomainReference();
+			}
+			return basicGetColumnDomainReference();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE:
+			setColumnDomainReference((VDomainModelReference) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE:
+			setColumnDomainReference((VDomainModelReference) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE:
+			return columnDomainReference != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == VTableColumnConfiguration.class) {
+			switch (derivedFeatureID) {
+			default:
+				return -1;
+			}
+		}
+		if (baseClass == VSingleColumnConfiguration.class) {
+			switch (derivedFeatureID) {
+			case VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE:
+				return VTablePackage.SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE;
+			default:
+				return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == VTableColumnConfiguration.class) {
+			switch (baseFeatureID) {
+			default:
+				return -1;
+			}
+		}
+		if (baseClass == VSingleColumnConfiguration.class) {
+			switch (baseFeatureID) {
+			case VTablePackage.SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE:
+				return VTablePackage.ENABLEMENT_CONFIGURATION__COLUMN_DOMAIN_REFERENCE;
+			default:
+				return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+} // VEnablementConfigurationImpl
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VReadOnlyColumnConfigurationImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VReadOnlyColumnConfigurationImpl.java
index 7263ee7b26..31081ee049 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VReadOnlyColumnConfigurationImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VReadOnlyColumnConfigurationImpl.java
@@ -35,7 +35,8 @@ import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
  *
  * @generated
  */
-public class VReadOnlyColumnConfigurationImpl extends EObjectImpl implements VReadOnlyColumnConfiguration {
+public class VReadOnlyColumnConfigurationImpl extends EObjectImpl
+	implements VReadOnlyColumnConfiguration {
 	/**
 	 * The cached value of the '{@link #getColumnDomainReferences() <em>Column Domain References</em>}' reference list.
 	 * <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java
index c611aedcaa..ae3d2270fc 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java
@@ -38,6 +38,8 @@ import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
  * <ul>
  * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#isAddRemoveDisabled <em>Add Remove
  * Disabled</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#isMoveUpDownDisabled <em>Move Up Down
+ * Disabled</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#getColumnConfigurations <em>Column
  * Configurations</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#getDetailEditing <em>Detail
@@ -73,6 +75,28 @@ public class VTableControlImpl extends VControlImpl implements VTableControl {
 	protected boolean addRemoveDisabled = ADD_REMOVE_DISABLED_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #isMoveUpDownDisabled() <em>Move Up Down Disabled</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isMoveUpDownDisabled()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean MOVE_UP_DOWN_DISABLED_EDEFAULT = true;
+
+	/**
+	 * The cached value of the '{@link #isMoveUpDownDisabled() <em>Move Up Down Disabled</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #isMoveUpDownDisabled()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean moveUpDownDisabled = MOVE_UP_DOWN_DISABLED_EDEFAULT;
+
+	/**
 	 * The cached value of the '{@link #getColumnConfigurations() <em>Column Configurations</em>}' containment reference
 	 * list.
 	 * <!-- begin-user-doc -->
@@ -195,6 +219,33 @@ public class VTableControlImpl extends VControlImpl implements VTableControl {
 	 * @generated
 	 */
 	@Override
+	public boolean isMoveUpDownDisabled() {
+		return moveUpDownDisabled;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setMoveUpDownDisabled(boolean newMoveUpDownDisabled) {
+		final boolean oldMoveUpDownDisabled = moveUpDownDisabled;
+		moveUpDownDisabled = newMoveUpDownDisabled;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, VTablePackage.TABLE_CONTROL__MOVE_UP_DOWN_DISABLED,
+				oldMoveUpDownDisabled, moveUpDownDisabled));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EList<VTableColumnConfiguration> getColumnConfigurations() {
 		if (columnConfigurations == null) {
 			columnConfigurations = new EObjectContainmentEList<VTableColumnConfiguration>(
@@ -350,6 +401,8 @@ public class VTableControlImpl extends VControlImpl implements VTableControl {
 		switch (featureID) {
 		case VTablePackage.TABLE_CONTROL__ADD_REMOVE_DISABLED:
 			return isAddRemoveDisabled();
+		case VTablePackage.TABLE_CONTROL__MOVE_UP_DOWN_DISABLED:
+			return isMoveUpDownDisabled();
 		case VTablePackage.TABLE_CONTROL__COLUMN_CONFIGURATIONS:
 			return getColumnConfigurations();
 		case VTablePackage.TABLE_CONTROL__DETAIL_EDITING:
@@ -375,6 +428,9 @@ public class VTableControlImpl extends VControlImpl implements VTableControl {
 		case VTablePackage.TABLE_CONTROL__ADD_REMOVE_DISABLED:
 			setAddRemoveDisabled((Boolean) newValue);
 			return;
+		case VTablePackage.TABLE_CONTROL__MOVE_UP_DOWN_DISABLED:
+			setMoveUpDownDisabled((Boolean) newValue);
+			return;
 		case VTablePackage.TABLE_CONTROL__COLUMN_CONFIGURATIONS:
 			getColumnConfigurations().clear();
 			getColumnConfigurations().addAll((Collection<? extends VTableColumnConfiguration>) newValue);
@@ -404,6 +460,9 @@ public class VTableControlImpl extends VControlImpl implements VTableControl {
 		case VTablePackage.TABLE_CONTROL__ADD_REMOVE_DISABLED:
 			setAddRemoveDisabled(ADD_REMOVE_DISABLED_EDEFAULT);
 			return;
+		case VTablePackage.TABLE_CONTROL__MOVE_UP_DOWN_DISABLED:
+			setMoveUpDownDisabled(MOVE_UP_DOWN_DISABLED_EDEFAULT);
+			return;
 		case VTablePackage.TABLE_CONTROL__COLUMN_CONFIGURATIONS:
 			getColumnConfigurations().clear();
 			return;
@@ -431,6 +490,8 @@ public class VTableControlImpl extends VControlImpl implements VTableControl {
 		switch (featureID) {
 		case VTablePackage.TABLE_CONTROL__ADD_REMOVE_DISABLED:
 			return addRemoveDisabled != ADD_REMOVE_DISABLED_EDEFAULT;
+		case VTablePackage.TABLE_CONTROL__MOVE_UP_DOWN_DISABLED:
+			return moveUpDownDisabled != MOVE_UP_DOWN_DISABLED_EDEFAULT;
 		case VTablePackage.TABLE_CONTROL__COLUMN_CONFIGURATIONS:
 			return columnConfigurations != null && !columnConfigurations.isEmpty();
 		case VTablePackage.TABLE_CONTROL__DETAIL_EDITING:
@@ -458,6 +519,8 @@ public class VTableControlImpl extends VControlImpl implements VTableControl {
 		final StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (addRemoveDisabled: "); //$NON-NLS-1$
 		result.append(addRemoveDisabled);
+		result.append(", moveUpDownDisabled: "); //$NON-NLS-1$
+		result.append(moveUpDownDisabled);
 		result.append(", detailEditing: "); //$NON-NLS-1$
 		result.append(detailEditing);
 		result.append(", enableDetailEditingDialog: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableFactoryImpl.java
index d0030a8986..d859ef70c7 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableFactoryImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.emf.ecp.view.spi.table.model.DetailEditing;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
@@ -81,6 +82,8 @@ public class VTableFactoryImpl extends EFactoryImpl implements VTableFactory {
 			return createReadOnlyColumnConfiguration();
 		case VTablePackage.WIDTH_CONFIGURATION:
 			return createWidthConfiguration();
+		case VTablePackage.ENABLEMENT_CONFIGURATION:
+			return createEnablementConfiguration();
 		default:
 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -169,6 +172,19 @@ public class VTableFactoryImpl extends EFactoryImpl implements VTableFactory {
 
 	/**
 	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public VEnablementConfiguration createEnablementConfiguration() {
+		final VEnablementConfigurationImpl enablementConfiguration = new VEnablementConfigurationImpl();
+		return enablementConfiguration;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java
index 0f683d16bc..956aaeb275 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java
@@ -20,7 +20,9 @@ import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.table.model.DetailEditing;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
@@ -83,6 +85,22 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 	 *
 	 * @generated
 	 */
+	private EClass enablementConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass singleColumnConfigurationEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
 	private EEnum detailEditingEEnum = null;
 
 	/**
@@ -192,8 +210,19 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 	 * @generated
 	 */
 	@Override
+	public EAttribute getTableControl_MoveUpDownDisabled() {
+		return (EAttribute) tableControlEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EReference getTableControl_ColumnConfigurations() {
-		return (EReference) tableControlEClass.getEStructuralFeatures().get(1);
+		return (EReference) tableControlEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
@@ -204,7 +233,7 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 	 */
 	@Override
 	public EAttribute getTableControl_DetailEditing() {
-		return (EAttribute) tableControlEClass.getEStructuralFeatures().get(2);
+		return (EAttribute) tableControlEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
@@ -215,7 +244,7 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 	 */
 	@Override
 	public EReference getTableControl_DetailView() {
-		return (EReference) tableControlEClass.getEStructuralFeatures().get(3);
+		return (EReference) tableControlEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
@@ -226,7 +255,7 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 	 */
 	@Override
 	public EAttribute getTableControl_EnableDetailEditingDialog() {
-		return (EAttribute) tableControlEClass.getEStructuralFeatures().get(4);
+		return (EAttribute) tableControlEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
@@ -316,8 +345,8 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 	 * @generated
 	 */
 	@Override
-	public EReference getWidthConfiguration_ColumnDomainReference() {
-		return (EReference) widthConfigurationEClass.getEStructuralFeatures().get(0);
+	public EAttribute getWidthConfiguration_Weight() {
+		return (EAttribute) widthConfigurationEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -328,20 +357,44 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 	 * @generated
 	 */
 	@Override
-	public EAttribute getWidthConfiguration_Weight() {
+	public EAttribute getWidthConfiguration_MinWidth() {
 		return (EAttribute) widthConfigurationEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
-         * @since 1.9
-	 * <!-- end-user-doc -->
 	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public EAttribute getWidthConfiguration_MinWidth() {
-		return (EAttribute) widthConfigurationEClass.getEStructuralFeatures().get(2);
+	public EClass getEnablementConfiguration() {
+		return enablementConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EClass getSingleColumnConfiguration() {
+		return singleColumnConfigurationEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EReference getSingleColumnConfiguration_ColumnDomainReference() {
+		return (EReference) singleColumnConfigurationEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
@@ -391,6 +444,7 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 		// Create classes and their features
 		tableControlEClass = createEClass(TABLE_CONTROL);
 		createEAttribute(tableControlEClass, TABLE_CONTROL__ADD_REMOVE_DISABLED);
+		createEAttribute(tableControlEClass, TABLE_CONTROL__MOVE_UP_DOWN_DISABLED);
 		createEReference(tableControlEClass, TABLE_CONTROL__COLUMN_CONFIGURATIONS);
 		createEAttribute(tableControlEClass, TABLE_CONTROL__DETAIL_EDITING);
 		createEReference(tableControlEClass, TABLE_CONTROL__DETAIL_VIEW);
@@ -406,10 +460,14 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 		createEReference(readOnlyColumnConfigurationEClass, READ_ONLY_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCES);
 
 		widthConfigurationEClass = createEClass(WIDTH_CONFIGURATION);
-		createEReference(widthConfigurationEClass, WIDTH_CONFIGURATION__COLUMN_DOMAIN_REFERENCE);
 		createEAttribute(widthConfigurationEClass, WIDTH_CONFIGURATION__WEIGHT);
 		createEAttribute(widthConfigurationEClass, WIDTH_CONFIGURATION__MIN_WIDTH);
 
+		enablementConfigurationEClass = createEClass(ENABLEMENT_CONFIGURATION);
+
+		singleColumnConfigurationEClass = createEClass(SINGLE_COLUMN_CONFIGURATION);
+		createEReference(singleColumnConfigurationEClass, SINGLE_COLUMN_CONFIGURATION__COLUMN_DOMAIN_REFERENCE);
+
 		// Create enums
 		detailEditingEEnum = createEEnum(DETAIL_EDITING);
 	}
@@ -452,7 +510,10 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 		tableControlEClass.getESuperTypes().add(theViewPackage.getControl());
 		tableDomainModelReferenceEClass.getESuperTypes().add(theViewPackage.getFeaturePathDomainModelReference());
 		readOnlyColumnConfigurationEClass.getESuperTypes().add(getTableColumnConfiguration());
-		widthConfigurationEClass.getESuperTypes().add(getTableColumnConfiguration());
+		widthConfigurationEClass.getESuperTypes().add(getSingleColumnConfiguration());
+		enablementConfigurationEClass.getESuperTypes().add(theViewPackage.getElement());
+		enablementConfigurationEClass.getESuperTypes().add(getSingleColumnConfiguration());
+		singleColumnConfigurationEClass.getESuperTypes().add(getTableColumnConfiguration());
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(tableControlEClass, VTableControl.class, "TableControl", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
@@ -460,6 +521,9 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 		initEAttribute(getTableControl_AddRemoveDisabled(), ecorePackage.getEBoolean(), "addRemoveDisabled", "false", 1, //$NON-NLS-1$ //$NON-NLS-2$
 			1, VTableControl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTableControl_MoveUpDownDisabled(), ecorePackage.getEBoolean(), "moveUpDownDisabled", "true", //$NON-NLS-1$ //$NON-NLS-2$
+			1, 1, VTableControl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 		initEReference(getTableControl_ColumnConfigurations(), getTableColumnConfiguration(), null,
 			"columnConfigurations", null, 0, -1, VTableControl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
 			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -495,9 +559,6 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 
 		initEClass(widthConfigurationEClass, VWidthConfiguration.class, "WidthConfiguration", !IS_ABSTRACT, //$NON-NLS-1$
 			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getWidthConfiguration_ColumnDomainReference(), theViewPackage.getDomainModelReference(), null,
-			"columnDomainReference", null, 1, 1, VWidthConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
-			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWidthConfiguration_Weight(), ecorePackage.getEInt(), "weight", null, 1, 1, //$NON-NLS-1$
 			VWidthConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
@@ -505,6 +566,15 @@ public class VTablePackageImpl extends EPackageImpl implements VTablePackage {
 			VWidthConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 
+		initEClass(enablementConfigurationEClass, VEnablementConfiguration.class, "EnablementConfiguration", //$NON-NLS-1$
+			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(singleColumnConfigurationEClass, VSingleColumnConfiguration.class, "SingleColumnConfiguration", //$NON-NLS-1$
+			IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getSingleColumnConfiguration_ColumnDomainReference(), theViewPackage.getDomainModelReference(),
+			null, "columnDomainReference", null, 1, 1, VSingleColumnConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Initialize enums and add enum literals
 		initEEnum(detailEditingEEnum, DetailEditing.class, "DetailEditing"); //$NON-NLS-1$
 		addEEnumLiteral(detailEditingEEnum, DetailEditing.NONE);
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java
index 9c9afc8af6..a1d4f74b90 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java
@@ -20,7 +20,9 @@ import org.eclipse.emf.ecp.view.spi.model.VControl;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
@@ -114,6 +116,16 @@ public class TableAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
+		public Adapter caseEnablementConfiguration(VEnablementConfiguration object) {
+			return createEnablementConfigurationAdapter();
+		}
+
+		@Override
+		public Adapter caseSingleColumnConfiguration(VSingleColumnConfiguration object) {
+			return createSingleColumnConfigurationAdapter();
+		}
+
+		@Override
 		public Adapter caseElement(VElement object) {
 			return createElementAdapter();
 		}
@@ -241,6 +253,41 @@ public class TableAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration <em>Enablement Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration
+	 * @generated
+	 */
+	public Adapter createEnablementConfigurationAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration <em>Single Column
+	 * Configuration</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration
+	 * @generated
+	 */
+	public Adapter createSingleColumnConfigurationAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VElement
 	 * <em>Element</em>}'.
 	 * <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableSwitch.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableSwitch.java
index 5c17aca940..061f467cf0 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableSwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableSwitch.java
@@ -19,7 +19,9 @@ import org.eclipse.emf.ecp.view.spi.model.VControl;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
 import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
@@ -143,6 +145,9 @@ public class TableSwitch<T> extends Switch<T> {
 			final VWidthConfiguration widthConfiguration = (VWidthConfiguration) theEObject;
 			T result = caseWidthConfiguration(widthConfiguration);
 			if (result == null) {
+				result = caseSingleColumnConfiguration(widthConfiguration);
+			}
+			if (result == null) {
 				result = caseTableColumnConfiguration(widthConfiguration);
 			}
 			if (result == null) {
@@ -150,6 +155,34 @@ public class TableSwitch<T> extends Switch<T> {
 			}
 			return result;
 		}
+		case VTablePackage.ENABLEMENT_CONFIGURATION: {
+			final VEnablementConfiguration enablementConfiguration = (VEnablementConfiguration) theEObject;
+			T result = caseEnablementConfiguration(enablementConfiguration);
+			if (result == null) {
+				result = caseElement(enablementConfiguration);
+			}
+			if (result == null) {
+				result = caseSingleColumnConfiguration(enablementConfiguration);
+			}
+			if (result == null) {
+				result = caseTableColumnConfiguration(enablementConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
+		case VTablePackage.SINGLE_COLUMN_CONFIGURATION: {
+			final VSingleColumnConfiguration singleColumnConfiguration = (VSingleColumnConfiguration) theEObject;
+			T result = caseSingleColumnConfiguration(singleColumnConfiguration);
+			if (result == null) {
+				result = caseTableColumnConfiguration(singleColumnConfiguration);
+			}
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
 		default:
 			return defaultCase(theEObject);
 		}
@@ -237,6 +270,40 @@ public class TableSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Enablement Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Enablement Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEnablementConfiguration(VEnablementConfiguration object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Single Column Configuration</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Single Column Configuration</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseSingleColumnConfiguration(VSingleColumnConfiguration object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Element</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java
index cd0c1cc817..b6e8435598 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java
@@ -38,7 +38,9 @@ import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.model.util.ViewValidator;
 import org.eclipse.emf.ecp.view.spi.table.model.DetailEditing;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration;
+import org.eclipse.emf.ecp.view.spi.table.model.VSingleColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
@@ -176,6 +178,10 @@ public class TableValidator extends EObjectValidator {
 			return validateReadOnlyColumnConfiguration((VReadOnlyColumnConfiguration) value, diagnostics, context);
 		case VTablePackage.WIDTH_CONFIGURATION:
 			return validateWidthConfiguration((VWidthConfiguration) value, diagnostics, context);
+		case VTablePackage.ENABLEMENT_CONFIGURATION:
+			return validateEnablementConfiguration((VEnablementConfiguration) value, diagnostics, context);
+		case VTablePackage.SINGLE_COLUMN_CONFIGURATION:
+			return validateSingleColumnConfiguration((VSingleColumnConfiguration) value, diagnostics, context);
 		case VTablePackage.DETAIL_EDITING:
 			return validateDetailEditing((DetailEditing) value, diagnostics, context);
 		default:
@@ -253,12 +259,13 @@ public class TableValidator extends EObjectValidator {
 		}
 		return viewValidator.validateDomainModelReference(domainModelReference, diagnostics, context);
 	}
+	// end of custom code
 
 	/**
-	 * @generated
-	 * 			<!-- begin-user-doc -->
-	 *            <!-- end-user-doc -->
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 *
+	 * @generated
 	 */
 	public boolean validateTableColumnConfiguration(VTableColumnConfiguration tableColumnConfiguration,
 		DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -497,6 +504,30 @@ public class TableValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateEnablementConfiguration(VEnablementConfiguration enablementConfiguration,
+		DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(enablementConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateSingleColumnConfiguration(VSingleColumnConfiguration singleColumnConfiguration,
+		DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(singleColumnConfiguration, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
index 0d26e7f1b3..27a4b1e541 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
@@ -2,35 +2,39 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Nebula Grid Table UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+Bundle-Localization: OSGI-INF/l10n/bundle
+Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Service-Component: OSGI-INF/GridControlSWTRendererService.xml
+Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.spi.table.swt;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
@@ -45,6 +49,5 @@ Import-Package: javax.inject;version="1.0.0",
  org.eclipse.swt.graphics;version="0.0.0",
  org.eclipse.swt.layout;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
+ org.osgi.framework;version="1.8.0",
  org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
-Service-Component: OSGI-INF/GridControlSWTRendererService.xml
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..18c4cbbabd
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,2 @@
+InvalidPaste.Title=Invalid Paste
+InvalidPaste.Message=Some entries have not been pasted:\n
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
index 5c1704d024..560262b3cf 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java
index 005dcc9d4b..ae1145957e 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java
@@ -12,18 +12,29 @@
 package org.eclipse.emf.ecp.view.internal.table.nebula.grid;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.StringTokenizer;
 
+import org.eclipse.core.databinding.observable.IObserving;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecp.view.spi.model.VControl;
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emfforms.spi.common.converter.EStructuralFeatureValueConverterService;
+import org.eclipse.emfforms.spi.common.validation.PreSetValidationService;
 import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
+import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
 import org.eclipse.emfforms.spi.swt.table.AbstractTableViewerComposite;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.nebula.widgets.grid.Grid;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.Clipboard;
@@ -32,6 +43,10 @@ import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 /**
  * {@link KeyListener} for the paste action on a {@link Grid} control.
@@ -43,6 +58,7 @@ import org.eclipse.swt.widgets.Display;
  */
 public class GridPasteKeyListener implements KeyListener {
 
+	private static final String IS_INPUTTABLE = "isInputtable"; //$NON-NLS-1$
 	private final Clipboard clipboard;
 	private final EMFFormsDatabindingEMF dataBinding;
 	private final EStructuralFeatureValueConverterService converterService;
@@ -50,6 +66,9 @@ public class GridPasteKeyListener implements KeyListener {
 
 	private boolean selectPastedCells = true;
 	private boolean alreadyPasted;
+	private final PreSetValidationService preSetValidationService;
+	private final Display display;
+	private final EMFFormsLocalizationService localizationService;
 
 	/**
 	 * Constructor.
@@ -58,15 +77,28 @@ public class GridPasteKeyListener implements KeyListener {
 	 * @param vControl the {@link VTableControl}.
 	 * @param dataBinding {@link EMFFormsDatabindingEMF}
 	 * @param converterService {@link EStructuralFeatureValueConverterService}
+	 * @param localizationService {@link EMFFormsLocalizationService}
 	 * @param selectPastedCells whether to select the pasted cells
 	 */
 	public GridPasteKeyListener(Display display, VControl vControl, EMFFormsDatabindingEMF dataBinding,
-		EStructuralFeatureValueConverterService converterService, boolean selectPastedCells) {
+		EStructuralFeatureValueConverterService converterService, EMFFormsLocalizationService localizationService,
+		boolean selectPastedCells) {
+		this.display = display;
+		this.localizationService = localizationService;
 		clipboard = new Clipboard(display);
 		this.vControl = vControl;
 		this.dataBinding = dataBinding;
 		this.converterService = converterService;
 		this.selectPastedCells = selectPastedCells;
+
+		final BundleContext bundleContext = FrameworkUtil
+			.getBundle(getClass())
+			.getBundleContext();
+
+		final ServiceReference<PreSetValidationService> serviceReference = bundleContext
+			.getServiceReference(PreSetValidationService.class);
+
+		preSetValidationService = serviceReference != null ? bundleContext.getService(serviceReference) : null;
 	}
 
 	@Override
@@ -126,7 +158,7 @@ public class GridPasteKeyListener implements KeyListener {
 	/**
 	 * Performs the paste operation.
 	 *
-	 * @param startItem the start uten
+	 * @param startItem the start item
 	 * @param grid the grid
 	 * @param contents the pasted contents
 	 * @return the pasted cells
@@ -137,7 +169,7 @@ public class GridPasteKeyListener implements KeyListener {
 		final int startRow = startItem.y;
 
 		final List<Point> pastedCells = new ArrayList<Point>();
-		final List<Object> pastedValues = new ArrayList<Object>();
+		final List<String> invalidValues = new ArrayList<String>();
 		int relativeRow = 0;
 		final String[] rows = contents.split("\r\n|\n", -1); //$NON-NLS-1$
 
@@ -171,17 +203,30 @@ public class GridPasteKeyListener implements KeyListener {
 
 					IObservableValue value = null;
 					try {
-
 						value = dataBinding.getObservableValue(dmr, eObject);
-						final Object convertedValue = converterService.convertToModelValue(eObject,
-							(EStructuralFeature) value.getValueType(), cellValue);
-						if (convertedValue != null) {
-							value.setValue(convertedValue);
-							pastedValues.add(value);
+						final EStructuralFeature feature = (EStructuralFeature) value.getValueType();
+						final Object convertedValue = getConverterService().convertToModelValue(eObject,
+							feature, cellValue);
+
+						boolean valid = convertedValue != null;
+
+						if (preSetValidationService != null) {
+							final Map<Object, Object> context = new LinkedHashMap<Object, Object>();
+							context.put("rootEObject", IObserving.class.cast(value).getObserved());//$NON-NLS-1$
+							final Diagnostic diag = preSetValidationService.validate(
+								feature, cellValue, context);
+							valid = diag.getSeverity() == Diagnostic.OK;
+							if (!valid) {
+								invalidValues.add(extractDiagnosticMessage(diag, feature, cellValue));
+							}
 						}
 
-						pastedCells.add(new Point(insertionColumnIndex, insertionRowIndex));
-
+						if (!canBePasted(feature, cellValue)) {
+							invalidValues.add(cellValue);
+						} else if (valid) {
+							setValue(value, convertedValue);
+							pastedCells.add(new Point(insertionColumnIndex, insertionRowIndex));
+						}
 					}
 					// BEGIN SUPRESS CATCH EXCEPTION
 					catch (final Exception ex) {// END SUPRESS CATCH EXCEPTION
@@ -197,7 +242,79 @@ public class GridPasteKeyListener implements KeyListener {
 			}
 			relativeRow++;
 		}
+
+		showErrors(invalidValues);
+
 		return pastedCells;
 	}
 
+	private void showErrors(List<String> msgs) {
+		if (!msgs.isEmpty()) {
+			showDialog(
+				display.getActiveShell(),
+				localizationService.getString(FrameworkUtil.getBundle(getClass()), "InvalidPaste.Title"), //$NON-NLS-1$
+				localizationService.getString(FrameworkUtil.getBundle(getClass()), "InvalidPaste.Message"), //$NON-NLS-1$
+				msgs);
+		}
+	}
+
+	private boolean canBePasted(EStructuralFeature feature, String cellValue) {
+
+		if (!EEnum.class.isInstance(feature.getEType())) {
+			return true;
+		}
+
+		final EEnum eEnum = (EEnum) feature.getEType();
+		for (final EEnumLiteral literal : eEnum.getELiterals()) {
+			final String isInputtable = EcoreUtil.getAnnotation(literal, VViewPackage.eNS_URI,
+				IS_INPUTTABLE);
+
+			if (literal.getLiteral().equals(cellValue) && isInputtable != null) {
+				return Boolean.getBoolean(isInputtable);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Sets the given converted value on the observable value.
+	 *
+	 * @param value the observable value
+	 * @param convertedValue the converted value
+	 */
+	protected void setValue(IObservableValue value, final Object convertedValue) {
+		value.setValue(convertedValue);
+	}
+
+	/**
+	 * Creates the message for the given {@link Diagnostic} which will be displayed to the user.
+	 *
+	 * @param diag the diagnostic with the original error message
+	 * @param feature the validated feature
+	 * @param value the validated value
+	 * @return the display string
+	 */
+	protected String extractDiagnosticMessage(Diagnostic diag, EStructuralFeature feature, String value) {
+		return diag.getChildren().get(0).getMessage();
+	}
+
+	private static void showDialog(Shell shell, String title, String msg, List<String> warnings) {
+		final StringBuilder builder = new StringBuilder();
+		builder.append(msg);
+		for (final String warning : warnings) {
+			builder.append("- " + warning) //$NON-NLS-1$
+				.append("\n"); //$NON-NLS-1$
+		}
+
+		MessageDialog.openWarning(shell, title, builder.toString());
+	}
+
+	/**
+	 *
+	 * @return the {@link EStructuralFeatureValueConverterService}
+	 */
+	protected EStructuralFeatureValueConverterService getConverterService() {
+		return converterService;
+	}
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridControlSWTRenderer.java
index 8b0575fc10..df68c35b1b 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridControlSWTRenderer.java
@@ -33,6 +33,8 @@ import org.eclipse.emfforms.spi.common.report.ReportService;
 import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
 import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
 import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService;
+import org.eclipse.emfforms.spi.swt.table.TableControl;
 import org.eclipse.emfforms.spi.swt.table.TableViewerCompositeBuilder;
 import org.eclipse.emfforms.spi.swt.table.TableViewerCreator;
 import org.eclipse.emfforms.spi.swt.table.TableViewerSWTBuilder;
@@ -55,6 +57,7 @@ import org.eclipse.swt.widgets.ScrollBar;
 public class GridControlSWTRenderer extends TableControlSWTRenderer {
 
 	private final EStructuralFeatureValueConverterService converterService;
+	private final EMFFormsLocalizationService localizationService;
 
 	/**
 	 * Default constructor.
@@ -68,6 +71,7 @@ public class GridControlSWTRenderer extends TableControlSWTRenderer {
 	 * @param imageRegistryService The {@link ImageRegistryService}
 	 * @param emfFormsEditSupport The {@link EMFFormsEditSupport}
 	 * @param converterService the {@link EStructuralFeatureValueConverterService}
+	 * @param localizationService the {@link EMFFormsLocalizationService}
 	 * @since 1.11
 	 */
 	@Inject
@@ -75,11 +79,13 @@ public class GridControlSWTRenderer extends TableControlSWTRenderer {
 	public GridControlSWTRenderer(VTableControl vElement, ViewModelContext viewContext, ReportService reportService,
 		EMFFormsDatabindingEMF emfFormsDatabinding, EMFFormsLabelProvider emfFormsLabelProvider,
 		VTViewTemplateProvider vtViewTemplateProvider, ImageRegistryService imageRegistryService,
-		EMFFormsEditSupport emfFormsEditSupport, EStructuralFeatureValueConverterService converterService) {
+		EMFFormsEditSupport emfFormsEditSupport, EStructuralFeatureValueConverterService converterService,
+		EMFFormsLocalizationService localizationService) {
 		// CHECKSTYLE.ON: ParameterNumber
 		super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider,
 			imageRegistryService, emfFormsEditSupport);
 		this.converterService = converterService;
+		this.localizationService = localizationService;
 	}
 
 	/**
@@ -87,7 +93,7 @@ public class GridControlSWTRenderer extends TableControlSWTRenderer {
 	 * custom variant data and the correct style properties as defined in the template model.
 	 *
 	 */
-	protected final class GridTableControlSWTRendererTableViewerCreator implements TableViewerCreator<GridTableViewer> {
+	protected class GridTableControlSWTRendererTableViewerCreator implements TableViewerCreator<GridTableViewer> {
 
 		@Override
 		public GridTableViewer createTableViewer(Composite parent) {
@@ -100,13 +106,7 @@ public class GridControlSWTRenderer extends TableControlSWTRenderer {
 			tableViewer.getGrid().setCellSelectionEnabled(true);
 			tableViewer.getGrid().setFooterVisible(false);
 
-			tableViewer.getGrid().addKeyListener(new GridCopyKeyListener(tableViewer.getGrid().getDisplay()));
-			tableViewer.getGrid()
-				.addKeyListener(new GridPasteKeyListener(tableViewer.getGrid().getDisplay(), getVElement(),
-					getEMFFormsDatabinding(), converterService, true));
-			tableViewer.getGrid().addKeyListener(new GridClearKeyListener(getVElement(), getEMFFormsDatabinding()));
-			tableViewer.getGrid().addKeyListener(
-				new GridCutKeyListener(tableViewer.getGrid().getDisplay(), getVElement(), getEMFFormsDatabinding()));
+			addKeyListener(tableViewer);
 			// TODO MS
 			// tableViewer.getGrid().addKeyListener(new GridNewLineKeyListener() {
 			//
@@ -151,6 +151,21 @@ public class GridControlSWTRenderer extends TableControlSWTRenderer {
 		}
 
 		/**
+		 * Add key listener.
+		 *
+		 * @param tableViewer the viewer to add the listeners to
+		 */
+		protected void addKeyListener(final GridTableViewer tableViewer) {
+			tableViewer.getGrid().addKeyListener(new GridCopyKeyListener(tableViewer.getGrid().getDisplay()));
+			tableViewer.getGrid()
+				.addKeyListener(new GridPasteKeyListener(tableViewer.getGrid().getDisplay(), getVElement(),
+					getEMFFormsDatabinding(), getConverterService(), getLocalizationService(), true));
+			tableViewer.getGrid().addKeyListener(new GridClearKeyListener(getVElement(), getEMFFormsDatabinding()));
+			tableViewer.getGrid().addKeyListener(
+				new GridCutKeyListener(tableViewer.getGrid().getDisplay(), getVElement(), getEMFFormsDatabinding()));
+		}
+
+		/**
 		 * This method creates and initialises a {@link GridViewerEditor} for the given {@link GridTableViewer}.
 		 *
 		 * @param gridTableViewer the table viewer
@@ -217,6 +232,48 @@ public class GridControlSWTRenderer extends TableControlSWTRenderer {
 		return ((GridTableViewer) getTableViewer()).getGrid().getVerticalBar();
 	}
 
+	@Override
+	protected int computeRequiredHeight(Integer visibleLines) {
+		if (getTableViewer() == null || getTableViewerComposite() == null) {
+			return SWT.DEFAULT;
+		}
+		final TableControl table = getTableViewerComposite().getTableControl();
+		if (table == null) {
+			return SWT.DEFAULT;
+		}
+		if (table.isDisposed()) {
+			return SWT.DEFAULT;
+		}
+		final int itemHeight = table.getItemHeight() + 1;
+		// show one empty row if table does not contain any items or visibleLines < 1
+		int itemCount;
+		if (visibleLines != null) {
+			itemCount = Math.max(visibleLines, 1);
+		} else {
+			itemCount = Math.max(table.getItemCount(), 1);
+		}
+		final int headerHeight = table.getHeaderVisible() ? table.getHeaderHeight() : 0;
+
+		final int tableHeight = itemHeight * itemCount + headerHeight;
+		return tableHeight;
+	}
+
+	/**
+	 *
+	 * @return the {@link EStructuralFeatureValueConverterService}
+	 */
+	protected EStructuralFeatureValueConverterService getConverterService() {
+		return converterService;
+	}
+
+	/**
+	 *
+	 * @return the {@link EMFFormsLocalizationService}
+	 */
+	protected EMFFormsLocalizationService getLocalizationService() {
+		return localizationService;
+	}
+
 	/**
 	 * EditorActivationStrategy for GridColumns.
 	 *
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
index fd99b9ad23..c269ae5615 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI RCP
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.rcp
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.13.0"
 Require-Bundle: org.eclipse.swt;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
  org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
index 5b390d98af..3c6fda4127 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.ui.rcp</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
index b88ae3847f..c8f0cfefa0 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI SWT Service for Persisting State
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.persistedstate
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/PersistTableStateServiceFactory.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml
index 9d5fd1b540..7f2797c0de 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.ui.swt.persistedstate</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
index 6283d1646f..506718d20c 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
@@ -1,37 +1,38 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table UI SWT
-Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt
-Bundle-Version: 1.12.0.qualifier
+Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt;singleton:=true
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.table.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test",
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test,org.eclipse.emf.ecp.view.table.ui.swt.test",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/tableDetailDialogRendererService.xml,OSGI-INF/tableDetailPanelRendererService.xml,OSGI-INF/tableRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.emf.edit.ui.dnd;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/OSGI-INF/l10n/bundle.properties
index 962cd2ad54..811b25a186 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/OSGI-INF/l10n/bundle.properties
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/OSGI-INF/l10n/bundle.properties
@@ -2,4 +2,6 @@ TableControl_ValidationStatusColumn=Validation Status
 TableControl_RemoveSelected=Remove the selected %1$s
 TableControl_AddInstanceOf=Add an instance of %1$s
 TableControl_Delete=Delete?
-TableControl_DeleteAreYouSure=Are you sure you want to delete the selected Elements?
\ No newline at end of file
+TableControl_DeleteAreYouSure=Are you sure you want to delete the selected Elements?
+TableControl_MoveUp=Move up the selected %1$s
+TableControl_MoveDown=Move down the selected %1$s
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/build.properties b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/build.properties
index e8dab34804..7e2028ac56 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/build.properties
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/build.properties
@@ -4,6 +4,7 @@ bin.includes = META-INF/,\
                icons/,\
                about.html,\
                schema/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               plugin.xml
 src.includes = about.html
 source.. = src/
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/icons/move_down.png b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/icons/move_down.png
new file mode 100644
index 0000000000..2c4e279377
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/icons/move_down.png
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/icons/move_up.png b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/icons/move_up.png
new file mode 100644
index 0000000000..1ebb193243
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/icons/move_up.png
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/plugin.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/plugin.xml
new file mode 100644
index 0000000000..a2f3f441dd
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/plugin.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension-point id="cellReadOnly" name="Cell Read Only" schema="schema/cellReadOnly.exsd"/>  
+   <extension
+         point="org.eclipse.emf.ecp.edit.swt.cellEditor">
+      <cellEditor
+            class="org.eclipse.emf.ecp.view.spi.table.swt.EnumCellEditor"
+            id="org.eclipse.emf.ecp.view.table.ui.swt.enumCellEditor"
+            tester="org.eclipse.emf.ecp.view.spi.table.swt.EnumCellEditorTester">
+      </cellEditor>
+   </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml
index 7cd142f7fe..9aee787d43 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.table.ui.swt</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/MessageKeys.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/MessageKeys.java
index 4e842b2c0c..c7d7d7e9b1 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/MessageKeys.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/MessageKeys.java
@@ -23,4 +23,6 @@ public interface MessageKeys {
 	String TableControl_AddInstanceOf = "TableControl_AddInstanceOf"; //$NON-NLS-1$
 	String TableControl_Delete = "TableControl_Delete"; //$NON-NLS-1$
 	String TableControl_DeleteAreYouSure = "TableControl_DeleteAreYouSure"; //$NON-NLS-1$
+	String TableControl_MoveUp = "TableControl_MoveUp"; //$NON-NLS-1$
+	String TableControl_MoveDown = "TableControl_MoveDown"; //$NON-NLS-1$
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/RunnableManager.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/RunnableManager.java
new file mode 100644
index 0000000000..13b9a5e695
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/RunnableManager.java
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.table.swt;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * A utility class that is capable of maintaining the running
+ * state of a {@link Runnable}, i.e. frequent calls of the {@link #executeAsync(Runnable)}
+ * with long running {@link Runnable}s will not result in each {@link Runnable} being called.
+ * This is useful, for instance, if the same {@link Runnable} is
+ * submitted multiple times unnecessarily.
+ *
+ */
+public class RunnableManager {
+
+	private final AtomicBoolean isRunning = new AtomicBoolean(false);
+	private final AtomicBoolean isPending = new AtomicBoolean(false);
+	private final Display display;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param display the {@link Display} that is used to submit a runnable
+	 */
+	public RunnableManager(Display display) {
+		this.display = display;
+	}
+
+	private void finish(Runnable runnable) {
+		// validation finished
+		isRunning.compareAndSet(true, false);
+		// re-trigger validation if we have a pending request
+		if (isPending.compareAndSet(true, false)) {
+			executeAsync(runnable);
+		}
+	}
+
+	private Runnable createWrapperRunnable(final Runnable runnable) {
+		return new Runnable() {
+			@Override
+			public void run() {
+				try {
+					runnable.run();
+				} finally {
+					finish(runnable);
+				}
+			}
+		};
+	}
+
+	/**
+	 * Execute the given {@link Runnable} via {@link Display#asyncExec(Runnable)}.
+	 *
+	 * @param runnable the {@link Runnable} to be executed asynchronously
+	 */
+	public void executeAsync(final Runnable runnable) {
+		if (isRunning.compareAndSet(false, true)) {
+			getDisplay().asyncExec(createWrapperRunnable(runnable));
+		} else {
+			isPending.compareAndSet(false, true);
+		}
+	}
+
+	/**
+	 * @return the display
+	 */
+	public synchronized Display getDisplay() {
+		return display;
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java
index c5da6362f4..96767c1567 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java
@@ -12,6 +12,7 @@
 package org.eclipse.emf.ecp.view.internal.table.swt;
 
 import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
@@ -57,6 +58,31 @@ public final class TableConfigurationHelper {
 	}
 
 	/**
+	 * Returns the {@link VEnablementConfiguration} for the given {@link VDomainModelReference}, if any.
+	 *
+	 * @param tableControl the {@link VTableControl}
+	 * @param columnDmr the {@link VDomainModelReference} a {@link VDomainModelReference} within the table
+	 * @return an {@link Optional} containing the {@link VEnablementConfiguration}
+	 */
+	public static Optional<VEnablementConfiguration> findEnablementConfiguration(
+		VTableControl tableControl,
+		VDomainModelReference columnDmr) {
+
+		for (final VTableColumnConfiguration columnConfiguration : tableControl.getColumnConfigurations()) {
+			if (VEnablementConfiguration.class.isInstance(columnConfiguration)) {
+				final VEnablementConfiguration configuration = VEnablementConfiguration.class
+					.cast(columnConfiguration);
+				if (configuration.getColumnDomainReference() == columnDmr) {
+					return Optional.of(configuration);
+				}
+			}
+		}
+
+		return Optional.empty();
+
+	}
+
+	/**
 	 * Retrieve any column width information available for the given column.
 	 *
 	 * @param tableControl the {@link VTableControl} containing the column configuration
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/CellEditorFactory.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/CellEditorFactory.java
index 9229580a93..1b9f5d4673 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/CellEditorFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/CellEditorFactory.java
@@ -1,169 +1,178 @@
-/*******************************************************************************

- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Eugen Neufeld - initial API and implementation

- ******************************************************************************/

-package org.eclipse.emf.ecp.view.spi.table.swt;

-

-import java.lang.reflect.Constructor;

-import java.lang.reflect.InvocationTargetException;

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.IConfigurationElement;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecp.edit.internal.swt.Activator;

-import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;

-import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorTester;

-import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.swt.widgets.Composite;

-import org.osgi.framework.Bundle;

-

-/**

- * Factory to created new {@link ECPCellEditor cell editors}.

- *

- * @since 1.10

- */

-public final class CellEditorFactory {

-	private static final String CONTROL_EXTENSION = "org.eclipse.emf.ecp.edit.swt.cellEditor"; //$NON-NLS-1$

-

-	private static final String CLASS_ATTRIBUTE = "class";//$NON-NLS-1$

-	private static final String ID = "id";//$NON-NLS-1$

-	private static final String TESTER = "tester";//$NON-NLS-1$

-

-	private final Set<CellDescriptor> descriptors = new HashSet<CellEditorFactory.CellDescriptor>();

-	/** CellEditorFactory instance. */

-	public static final CellEditorFactory INSTANCE = new CellEditorFactory();

-

-	private CellEditorFactory() {

-		parseExtensionPoint();

-	}

-

-	private void parseExtensionPoint() {

-		final IConfigurationElement[] controls = Platform.getExtensionRegistry().getConfigurationElementsFor(

-			CONTROL_EXTENSION);

-		for (final IConfigurationElement e : controls) {

-			try {

-				final String id = e.getAttribute(ID);

-				final String clazz = e.getAttribute(CLASS_ATTRIBUTE);

-				final Class<? extends CellEditor> resolvedClass = loadClass(e.getContributor().getName(), clazz);

-				final ECPCellEditorTester tester = (ECPCellEditorTester) e.createExecutableExtension(TESTER);

-				descriptors.add(new CellDescriptor(id, resolvedClass, tester));

-			} catch (final ClassNotFoundException e1) {

-				Activator.logException(e1);

-			} catch (final CoreException e1) {

-				Activator.logException(e1);

-			}

-		}

-	}

-

-	@SuppressWarnings("unchecked")

-	private static <T> Class<T> loadClass(String bundleName, String clazz) throws ClassNotFoundException {

-		final Bundle bundle = Platform.getBundle(bundleName);

-		if (bundle == null) {

-			throw new ClassNotFoundException(

-			// TODO Grid

-			// clazz

-			// + LocalizationServiceHelper.getString(CellEditorFactory.class,

-			// UtilMessageKeys.CellEditorFactory_CannotBeLoadedBecauseBundle)

-			// + bundleName

-			// + LocalizationServiceHelper.getString(CellEditorFactory.class,

-			// UtilMessageKeys.CellEditorFactory_CannotBeResolved)

-			);

-		}

-		return (Class<T>) bundle.loadClass(clazz);

-

-	}

-

-	/**

-	 * Returns a new instance of the {@link CellEditor} for the given object.

-	 *

-	 * @param eStructuralFeature the {@link EStructuralFeature} displayed in the cell editor

-	 * @param eObject the {@link EObject}

-	 * @param table the parent composite

-	 * @param viewModelContext the {@link ViewModelContext} used for the current view

-	 * @return the cell editor

-	 */

-	@SuppressWarnings("restriction")

-	public CellEditor getCellEditor(EStructuralFeature eStructuralFeature, EObject eObject, Composite table,

-		ViewModelContext viewModelContext) {

-		int bestPriority = -1;

-		CellDescriptor bestCandidate = null;

-		for (final CellDescriptor descriptor : descriptors) {

-			final int priority = descriptor.getTester().isApplicable(eObject, eStructuralFeature, viewModelContext);

-			if (priority > bestPriority) {

-				bestCandidate = descriptor;

-				bestPriority = priority;

-			}

-		}

-		CellEditor result = null;

-		if (bestCandidate != null) {

-			try {

-				final Constructor<? extends CellEditor> constructor = bestCandidate.getCellEditorClass()

-					.getConstructor(

-						Composite.class);

-				result = constructor.newInstance(table);

-				final ECPCellEditor ecpCellEditor = (ECPCellEditor) result;

-				ecpCellEditor.instantiate(eStructuralFeature, viewModelContext);

-			} catch (final SecurityException e) {

-				Activator.logException(e);

-			} catch (final NoSuchMethodException e) {

-				Activator.logException(e);

-			} catch (final IllegalArgumentException e) {

-				Activator.logException(e);

-			} catch (final InstantiationException e) {

-				Activator.logException(e);

-			} catch (final IllegalAccessException e) {

-				Activator.logException(e);

-			} catch (final InvocationTargetException e) {

-				Activator.logException(e);

-			} catch (final ClassCastException e) {

-				Activator.logException(e);

-			}

-		}

-		if (result == null) {

-			result = new TextCellEditor(table);

-		}

-		return result;

-	}

-

-	/**

-	 * Descriptor encapsulating the contributions to the <code>org.eclipse.emf.ecp.edit.swt.cellEditor</code> extension

-	 * point.

-	 */

-	private class CellDescriptor {

-		private final String id;

-		private final Class<? extends CellEditor> cellEditorClass;

-		private final ECPCellEditorTester tester;

-

-		CellDescriptor(String id, Class<? extends CellEditor> cellEditorClass, ECPCellEditorTester tester) {

-			super();

-			this.id = id;

-			this.cellEditorClass = cellEditorClass;

-			this.tester = tester;

-		}

-

-		String getId() {

-			return id;

-		}

-

-		Class<? extends CellEditor> getCellEditorClass() {

-			return cellEditorClass;

-		}

-

-		ECPCellEditorTester getTester() {

-			return tester;

-		}

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.swt;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.internal.swt.Activator;
+import org.eclipse.emf.ecp.edit.internal.swt.util.PreSetValidationListeners;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorTester;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.osgi.framework.Bundle;
+
+/**
+ * Factory to created new {@link ECPCellEditor cell editors}.
+ *
+ * @since 1.10
+ */
+public final class CellEditorFactory {
+	private static final String CONTROL_EXTENSION = "org.eclipse.emf.ecp.edit.swt.cellEditor"; //$NON-NLS-1$
+
+	private static final String CLASS_ATTRIBUTE = "class";//$NON-NLS-1$
+	private static final String ID = "id";//$NON-NLS-1$
+	private static final String TESTER = "tester";//$NON-NLS-1$
+
+	private final Set<CellDescriptor> descriptors = new HashSet<CellEditorFactory.CellDescriptor>();
+	/** CellEditorFactory instance. */
+	public static final CellEditorFactory INSTANCE = new CellEditorFactory();
+
+	private CellEditorFactory() {
+		parseExtensionPoint();
+	}
+
+	private void parseExtensionPoint() {
+		final IConfigurationElement[] controls = Platform.getExtensionRegistry().getConfigurationElementsFor(
+			CONTROL_EXTENSION);
+		for (final IConfigurationElement e : controls) {
+			try {
+				final String id = e.getAttribute(ID);
+				final String clazz = e.getAttribute(CLASS_ATTRIBUTE);
+				final Class<? extends CellEditor> resolvedClass = loadClass(e.getContributor().getName(), clazz);
+				final ECPCellEditorTester tester = (ECPCellEditorTester) e.createExecutableExtension(TESTER);
+				descriptors.add(new CellDescriptor(id, resolvedClass, tester));
+			} catch (final ClassNotFoundException e1) {
+				Activator.logException(e1);
+			} catch (final CoreException e1) {
+				Activator.logException(e1);
+			}
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private static <T> Class<T> loadClass(String bundleName, String clazz) throws ClassNotFoundException {
+		final Bundle bundle = Platform.getBundle(bundleName);
+		if (bundle == null) {
+			throw new ClassNotFoundException(
+			// TODO Grid
+			// clazz
+			// + LocalizationServiceHelper.getString(CellEditorFactory.class,
+			// UtilMessageKeys.CellEditorFactory_CannotBeLoadedBecauseBundle)
+			// + bundleName
+			// + LocalizationServiceHelper.getString(CellEditorFactory.class,
+			// UtilMessageKeys.CellEditorFactory_CannotBeResolved)
+			);
+		}
+		return (Class<T>) bundle.loadClass(clazz);
+
+	}
+
+	/**
+	 * Returns a new instance of the {@link CellEditor} for the given object.
+	 *
+	 * @param eStructuralFeature the {@link EStructuralFeature} displayed in the cell editor
+	 * @param eObject the {@link EObject}
+	 * @param table the parent composite
+	 * @param viewModelContext the {@link ViewModelContext} used for the current view
+	 * @return the cell editor
+	 */
+	@SuppressWarnings("restriction")
+	public CellEditor getCellEditor(final EStructuralFeature eStructuralFeature, final EObject eObject, Composite table,
+		ViewModelContext viewModelContext) {
+		int bestPriority = -1;
+		CellDescriptor bestCandidate = null;
+		for (final CellDescriptor descriptor : descriptors) {
+			final int priority = descriptor.getTester().isApplicable(eObject, eStructuralFeature, viewModelContext);
+			if (priority > bestPriority) {
+				bestCandidate = descriptor;
+				bestPriority = priority;
+			}
+		}
+		CellEditor result = null;
+		if (bestCandidate != null) {
+			try {
+				final Constructor<? extends CellEditor> constructor = bestCandidate.getCellEditorClass()
+					.getConstructor(
+						Composite.class);
+				result = constructor.newInstance(table);
+				final ECPCellEditor ecpCellEditor = (ECPCellEditor) result;
+				ecpCellEditor.instantiate(eStructuralFeature, viewModelContext);
+			} catch (final SecurityException e) {
+				Activator.logException(e);
+			} catch (final NoSuchMethodException e) {
+				Activator.logException(e);
+			} catch (final IllegalArgumentException e) {
+				Activator.logException(e);
+			} catch (final InstantiationException e) {
+				Activator.logException(e);
+			} catch (final IllegalAccessException e) {
+				Activator.logException(e);
+			} catch (final InvocationTargetException e) {
+				Activator.logException(e);
+			} catch (final ClassCastException e) {
+				Activator.logException(e);
+			}
+		}
+
+		if (result == null) {
+			result = new TextCellEditor(table);
+		}
+
+		if (Text.class.isInstance(result.getControl())) {
+			final Text text = (Text) result.getControl();
+			PreSetValidationListeners.create().verify(text, eStructuralFeature);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Descriptor encapsulating the contributions to the <code>org.eclipse.emf.ecp.edit.swt.cellEditor</code> extension
+	 * point.
+	 */
+	private class CellDescriptor {
+		private final String id;
+		private final Class<? extends CellEditor> cellEditorClass;
+		private final ECPCellEditorTester tester;
+
+		CellDescriptor(String id, Class<? extends CellEditor> cellEditorClass, ECPCellEditorTester tester) {
+			super();
+			this.id = id;
+			this.cellEditorClass = cellEditorClass;
+			this.tester = tester;
+		}
+
+		String getId() {
+			return id;
+		}
+
+		Class<? extends CellEditor> getCellEditorClass() {
+			return cellEditorClass;
+		}
+
+		ECPCellEditorTester getTester() {
+			return tester;
+		}
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/EnumCellEditor.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/EnumCellEditor.java
new file mode 100644
index 0000000000..a6e280fd04
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/EnumCellEditor.java
@@ -0,0 +1,535 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.swt;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPEnumCellEditor;
+import org.eclipse.emf.ecp.view.internal.core.swt.MatchItemComboViewer;
+import org.eclipse.emf.ecp.view.internal.table.swt.FigureUtilities;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.jface.databinding.swt.WidgetValueProperty;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * Generic {@link org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor ECPCellEditor} which is
+ * applicable for all {@link EAttribute EAttributes} with a Single {@link EEnum} data type.
+ *
+ * @since 1.13
+ */
+public class EnumCellEditor extends ECPEnumCellEditor {
+
+	private static final String EMPTY = ""; //$NON-NLS-1$
+	private EEnum eEnum;
+	private MatchItemComboViewer viewer;
+	private int minWidth;
+	private String text;
+	private EnumCellEditorLabelProvider labelProvider;
+
+	/**
+	 * Default constructor.
+	 *
+	 * @param parent the parent
+	 */
+	public EnumCellEditor(Composite parent) {
+		super(parent);
+	}
+
+	/**
+	 * Constructor allowing to specify a SWT style.
+	 *
+	 * @param parent the parent
+	 * @param style the SWT style
+	 */
+	public EnumCellEditor(Composite parent, int style) {
+		super(parent, style);
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#getValueProperty()
+	 */
+	@Override
+	public IValueProperty getValueProperty() {
+		return new ComboValueProperty();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#instantiate(org.eclipse.emf.ecore.EStructuralFeature,
+	 *      org.eclipse.emf.ecp.view.spi.context.ViewModelContext)
+	 */
+	@Override
+	public void instantiate(EStructuralFeature feature, ViewModelContext viewModelContext) {
+
+		final EAttribute attribute = EAttribute.class.cast(feature);
+		eEnum = EEnum.class.cast(attribute.getEAttributeType());
+		final int literalsSize = getELiterals().size();
+		viewer.getCCombo().setVisibleItemCount(literalsSize <= 25 ? literalsSize : 25);
+		final Point emptyViewerSize = viewer.getCCombo().computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+		minWidth = 50;
+		for (final EEnumLiteral literal : getELiterals()) {
+			final String string = literal.getInstance().getLiteral();
+			final int newWidth = FigureUtilities.getTextWidth(string, viewer.getCCombo().getFont());
+			if (newWidth > minWidth) {
+				minWidth = newWidth;
+			}
+		}
+		minWidth += emptyViewerSize.x;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#getFormatedString(java.lang.Object)
+	 */
+	@Override
+	public String getFormatedString(Object value) {
+		if (value != null) {
+			final Enumerator enumerator = (Enumerator) value;
+			return enumerator.getLiteral();
+		}
+		return EMPTY;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#getColumnWidthWeight()
+	 */
+	@Override
+	public int getColumnWidthWeight() {
+		return 100;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#getMinWidth()
+	 */
+	@Override
+	public int getMinWidth() {
+		return minWidth;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#getImage(java.lang.Object)
+	 */
+	@Override
+	public Image getImage(Object value) {
+		return null;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#getTargetToModelStrategy(org.eclipse.core.databinding.DataBindingContext)
+	 */
+	@Override
+	public UpdateValueStrategy getTargetToModelStrategy(DataBindingContext databindingContext) {
+		return new TargetToModelStrategy();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#getModelToTargetStrategy(org.eclipse.core.databinding.DataBindingContext)
+	 */
+	@Override
+	public UpdateValueStrategy getModelToTargetStrategy(DataBindingContext databindingContext) {
+		return new ModelToTargetStrategy();
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#getLayoutData()
+	 */
+	@Override
+	public LayoutData getLayoutData() {
+		final LayoutData data = new LayoutData();
+		data.minimumWidth = 0;
+		return data;
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor#setEditable(boolean)
+	 */
+	@Override
+	public void setEditable(boolean editable) {
+		viewer.getCCombo().setEnabled(editable);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#createControl(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected Control createControl(Composite parent) {
+		viewer = new MatchItemComboViewer(new CCombo(parent, SWT.NONE)) {
+
+			@Override
+			public void onEnter(int selectedIndex) {
+				if (!viewer.isEmptyBuffer() && selectedIndex > -1) {
+					final String closestMatch = getCCombo().getItems()[selectedIndex];
+					final Optional<SelectedEnumeratorMapping> selectedMappping = SelectedEnumeratorMapping
+						.findLiteral((SelectedEnumeratorMapping[]) getInput(), closestMatch);
+					if (selectedMappping.isPresent()) {
+						setSelection(new StructuredSelection(selectedMappping.get()));
+					}
+
+				} else {
+					setClosestMatch(getCCombo().getText());
+				}
+
+				focusLost();
+			}
+
+		};
+
+		final CCombo combo = viewer.getCCombo();
+
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(combo);
+		labelProvider = new EnumCellEditorLabelProvider();
+		viewer.setContentProvider(ArrayContentProvider.getInstance());
+		viewer.setLabelProvider(labelProvider);
+		return combo;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#doGetValue()
+	 */
+	@Override
+	protected Object doGetValue() {
+		return viewer.getInput();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#doSetFocus()
+	 */
+	@Override
+	protected void doSetFocus() {
+		final CCombo combo = viewer.getCCombo();
+		if (combo == null || combo.isDisposed()) {
+			return;
+		}
+		combo.setFocus();
+		// Remove text selection and move the cursor to the end.
+		final String text = combo.getText();
+		if (text != null) {
+			combo.setSelection(new Point(text.length(), text.length()));
+		}
+	}
+
+	/**
+	 *
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#activate(org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent)
+	 */
+	@Override
+	public void activate(ColumnViewerEditorActivationEvent actEvent) {
+		super.activate(actEvent);
+		if (actEvent.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED) {
+			final CCombo control = (CCombo) getControl();
+			if (control != null && Character.isLetterOrDigit(actEvent.character)) {
+				viewer.resetBuffer();
+				// key pressed is not fired during activation
+				final String characterAsString = String.valueOf(actEvent.character);
+				if (viewer.getClosestMatchIndex(characterAsString) != -1) {
+					control.setText(characterAsString);
+					viewer.addToBuffer(actEvent.character);
+					return;
+				}
+				// if invalid character, use first item as closest match and add
+				// first character to buffer
+				final String item = viewer.getCCombo().getItems()[0];
+				control.setText(item);
+				if (item != null && item.length() > 0) {
+					viewer.addToBuffer(item.charAt(0));
+				}
+
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#deactivate()
+	 */
+	@Override
+	public void deactivate() {
+		final CCombo control = (CCombo) getControl();
+
+		if (control != null && !control.isDisposed()) {
+			text = control.getText();
+			text = text == null ? EMPTY : text;
+		}
+
+		final SelectedEnumeratorMapping[] selectedMapping = (SelectedEnumeratorMapping[]) viewer.getInput();
+		if (selectedMapping != null) {
+			final Optional<SelectedEnumeratorMapping> sel = SelectedEnumeratorMapping.findLiteral(selectedMapping,
+				text);
+			if (sel.isPresent()) {
+				sel.get().setSelected(true);
+				viewer.setSelection(new StructuredSelection(sel.get()));
+			}
+		}
+
+		text = EMPTY;
+		viewer.resetBuffer();
+		viewer.resetKeyPressedTimer();
+
+		// As the same cell editor is used for all the rows.
+		// We need to reset the value to avoid the values are cached.
+		if (control != null && !control.isDisposed()) {
+			control.setText(""); //$NON-NLS-1$
+		}
+		super.deactivate();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.jface.viewers.CellEditor#doSetValue(java.lang.Object)
+	 */
+	@Override
+	protected void doSetValue(Object value) {
+		viewer.setInput(value);
+	}
+
+	private String getComboText(SelectedEnumeratorMapping[] input) {
+		final Optional<Enumerator> selected = SelectedEnumeratorMapping.findSelected(input);
+		if (selected.isPresent()) {
+			return selected.get().getLiteral();
+		}
+		return EMPTY;
+	}
+
+	/**
+	 * Returns the {@link EEnum} is cell editor responsible for.
+	 *
+	 * @return the enum
+	 */
+	@Override
+	public EEnum getEEnum() {
+		return eEnum;
+	}
+
+	/**
+	 * Label provider for the drop down.
+	 *
+	 *
+	 */
+	private class EnumCellEditorLabelProvider extends LabelProvider {
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
+		 */
+		@Override
+		public String getText(Object element) {
+			final SelectedEnumeratorMapping mapping = (SelectedEnumeratorMapping) element;
+			return mapping.getEnumerator().getLiteral();
+		}
+	}
+
+	/**
+	 * Target to model update strategy.
+	 *
+	 *
+	 */
+	private class TargetToModelStrategy extends EMFUpdateValueStrategy {
+		/*
+		 * (non-Javadoc)
+		 * @see org.eclipse.core.databinding.UpdateValueStrategy#convert(java.lang.Object)
+		 */
+		@Override
+		public Object convert(Object value) {
+			final SelectedEnumeratorMapping[] mapping = (SelectedEnumeratorMapping[]) value;
+			final Optional<Enumerator> selected = SelectedEnumeratorMapping.findSelected(mapping);
+			return selected.orNull();
+		}
+	}
+
+	/**
+	 * Model to target update strategy.
+	 *
+	 *
+	 */
+	private class ModelToTargetStrategy extends EMFUpdateValueStrategy {
+
+		@Override
+		public Object convert(Object value) {
+			final Enumerator enumerator = (Enumerator) value;
+			final SelectedEnumeratorMapping[] mapping = SelectedEnumeratorMapping.createFromList(getELiterals());
+			SelectedEnumeratorMapping.select(mapping, enumerator);
+			return mapping;
+		}
+	}
+
+	/**
+	 * Value property working on the combo.
+	 *
+	 */
+	private class ComboValueProperty extends WidgetValueProperty {
+
+		@Override
+		public Object getValueType() {
+			return CCombo.class;
+		}
+
+		@Override
+		protected Object doGetValue(Object source) {
+			return EnumCellEditor.this.getValue();
+		}
+
+		@Override
+		protected void doSetValue(Object source, Object value) {
+
+			EnumCellEditor.this.doSetValue(value);
+		}
+
+		@Override
+		public IObservableValue observe(Object source) {
+			return new ComboObservableValue();
+		}
+	}
+
+	/**
+	 * Observable value for the combo.
+	 *
+	 */
+	private class ComboObservableValue extends AbstractObservableValue {
+
+		private final EnumSelectionAdapter selectionAdapter;
+
+		/**
+		 * Default Constructor.
+		 */
+		ComboObservableValue() {
+			selectionAdapter = new EnumSelectionAdapter();
+			viewer.addSelectionChangedListener(selectionAdapter);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+		 */
+		@Override
+		public Object getValueType() {
+			return null;
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
+		 */
+		@Override
+		protected Object doGetValue() {
+			return viewer.getInput();
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
+		 */
+		@Override
+		protected void doSetValue(Object value) {
+			viewer.setInput(value);
+			viewer.getCCombo().setText(getComboText((SelectedEnumeratorMapping[]) value));
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.core.databinding.observable.AbstractObservable#dispose()
+		 */
+		@Override
+		public synchronized void dispose() {
+			viewer.removeSelectionChangedListener(selectionAdapter);
+			super.dispose();
+		}
+
+		/**
+		 * Selection adapter for the combo.
+		 *
+		 *
+		 */
+		private class EnumSelectionAdapter implements ISelectionChangedListener {
+
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				final SelectedEnumeratorMapping mapping = (SelectedEnumeratorMapping) ((IStructuredSelection) event
+					.getSelection())
+						.getFirstElement();
+				if (mapping == null) {
+					return;
+				}
+				final SelectedEnumeratorMapping[] allMapping = (SelectedEnumeratorMapping[]) viewer.getInput();
+				SelectedEnumeratorMapping.deselectAll(allMapping);
+				mapping.setSelected(!mapping.isSelected());
+				viewer.getCCombo().setText(getComboText((SelectedEnumeratorMapping[]) viewer.getInput()));
+				viewer.update(mapping, null);
+				fireValueChange(Diffs.createValueDiff(!mapping.isSelected(), mapping.isSelected()));
+			}
+		}
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/EnumCellEditorTester.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/EnumCellEditorTester.java
new file mode 100644
index 0000000000..001ac2867b
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/EnumCellEditorTester.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.swt;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorTester;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+
+/**
+ * Tester for the {@link EnumCellEditor}.
+ *
+ * @since 1.13
+ */
+public class EnumCellEditorTester implements ECPCellEditorTester {
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorTester#isApplicable(org.eclipse.emf.ecore.EObject,
+	 *      org.eclipse.emf.ecore.EStructuralFeature, org.eclipse.emf.ecp.view.spi.context.ViewModelContext)
+	 */
+	@Override
+	public int isApplicable(EObject eObject, EStructuralFeature eStructuralFeature, ViewModelContext viewModelContext) {
+		if (eStructuralFeature.isMany()) {
+			return NOT_APPLICABLE;
+		}
+
+		if (!EAttribute.class.isInstance(eStructuralFeature)) {
+			return NOT_APPLICABLE;
+		}
+
+		final EDataType attributeType = EAttribute.class.cast(eStructuralFeature).getEAttributeType();
+		if (!EEnum.class.isInstance(attributeType)) {
+			return NOT_APPLICABLE;
+		}
+
+		return 5;
+	}
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/SelectedEnumeratorMapping.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/SelectedEnumeratorMapping.java
new file mode 100644
index 0000000000..6e34779c2a
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/SelectedEnumeratorMapping.java
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.swt;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emfforms.common.Optional;
+
+/**
+ * Utility class that determines whether
+ * a given {@link Enumerator} and has been selected.
+ *
+ * @since 1.13
+ */
+public class SelectedEnumeratorMapping {
+
+	private boolean selected;
+	private final Enumerator enumerator;
+
+	/**
+	 * Search the array of {@link SelectedEnumeratorMapping}s for the given literal.
+	 *
+	 * @param mapping the array of mappings to be searched
+	 * @param literal the literal to be searched for as a string
+	 * @return an {@link Optional} containing the matched literal
+	 */
+	public static Optional<SelectedEnumeratorMapping> findLiteral(SelectedEnumeratorMapping[] mapping,
+		String literal) {
+
+		for (final SelectedEnumeratorMapping m : mapping) {
+			if (m.getEnumerator().getLiteral().equals(literal)) {
+				return Optional.of(m);
+			}
+		}
+
+		return Optional.empty();
+	}
+
+	/**
+	 * Find the first selected enumerator.
+	 *
+	 * @param mapping an array of {@link SelectedEnumeratorMapping}s
+	 * @return an {@link Optional} containing the selected {@link Enumerator}
+	 */
+	public static Optional<Enumerator> findSelected(SelectedEnumeratorMapping[] mapping) {
+
+		for (final SelectedEnumeratorMapping current : mapping) {
+			if (current.isSelected()) {
+				return Optional.of(current.getEnumerator());
+			}
+		}
+
+		return Optional.empty();
+	}
+
+	/**
+	 * Given a list of {@link EEnumLiteral}s creates an array of {@link SelectedEnumeratorMapping}s.
+	 *
+	 * @param literals a list of {@link EEnumLiteral}s
+	 * @return an array of {@link SelectedEnumeratorMapping}
+	 */
+	public static SelectedEnumeratorMapping[] createFromList(List<EEnumLiteral> literals) {
+		final SelectedEnumeratorMapping[] mapping = new SelectedEnumeratorMapping[literals.size()];
+		int i = 0;
+		for (final EEnumLiteral literal : literals) {
+			final SelectedEnumeratorMapping current = new SelectedEnumeratorMapping(literal.getInstance(),
+				false);
+			mapping[i++] = current;
+		}
+		return mapping;
+	}
+
+	/**
+	 * Select the given {@link Enumerator} in the list of given {@link SelectedEnumeratorMapping}s.
+	 *
+	 * @param mappings an array of {@link SelectedEnumeratorMapping}s,
+	 * @param enumerator the {@link Enumerator} to be selected
+	 */
+	public static void select(SelectedEnumeratorMapping[] mappings, Enumerator enumerator) {
+		for (final SelectedEnumeratorMapping selectedEnumeratorMapping : mappings) {
+			if (enumerator.equals(selectedEnumeratorMapping.getEnumerator())) {
+				selectedEnumeratorMapping.setSelected(true);
+			}
+		}
+	}
+
+	/**
+	 * De-select all enumerators in the given array of {@link SelectedEnumeratorMapping}s.
+	 * 
+	 * @param mappings an array of {@link SelectedEnumeratorMapping}s
+	 */
+	public static void deselectAll(final SelectedEnumeratorMapping[] mappings) {
+		for (final SelectedEnumeratorMapping selectedMapping : mappings) {
+			selectedMapping.setSelected(false);
+		}
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @param enumerator the {@link Enumerator} entry
+	 * @param selected whether the given enumerator is selected
+	 */
+	public SelectedEnumeratorMapping(Enumerator enumerator, boolean selected) {
+		this.enumerator = enumerator;
+		setSelected(selected);
+	}
+
+	/**
+	 * Returns whether whether the enumerator is selected.
+	 *
+	 * @return {@code true}, if the enumerator is selected
+	 */
+	public boolean isSelected() {
+		return selected;
+	}
+
+	/**
+	 * Returns whether whether the enumerator is selected.
+	 *
+	 * @param selected the selected state
+	 */
+	public void setSelected(boolean selected) {
+		this.selected = selected;
+	}
+
+	/**
+	 * Returns the enumerator.
+	 *
+	 * @return the enumerator
+	 */
+	public Enumerator getEnumerator() {
+		return enumerator;
+	}
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
index d432a7d157..e4dbd6463f 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
@@ -17,6 +17,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -56,6 +58,7 @@ import org.eclipse.emf.ecp.edit.spi.swt.table.ECPElementAwareCellEditor;
 import org.eclipse.emf.ecp.edit.spi.swt.util.ECPDialogExecutor;
 import org.eclipse.emf.ecp.view.internal.table.swt.CellReadOnlyTesterHelper;
 import org.eclipse.emf.ecp.view.internal.table.swt.MessageKeys;
+import org.eclipse.emf.ecp.view.internal.table.swt.RunnableManager;
 import org.eclipse.emf.ecp.view.internal.table.swt.TableConfigurationHelper;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer;
@@ -67,6 +70,7 @@ import org.eclipse.emf.ecp.view.spi.provider.ECPTooltipModifierHelper;
 import org.eclipse.emf.ecp.view.spi.renderer.NoPropertyDescriptorFoundExeption;
 import org.eclipse.emf.ecp.view.spi.renderer.NoRendererFoundException;
 import org.eclipse.emf.ecp.view.spi.swt.reporting.RenderingFailedReport;
+import org.eclipse.emf.ecp.view.spi.table.model.VEnablementConfiguration;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
 import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
 import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
@@ -191,6 +195,8 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 
 	private static final String ICON_ADD = "icons/add.png"; //$NON-NLS-1$
 	private static final String ICON_DELETE = "icons/delete.png"; //$NON-NLS-1$
+	private static final String ICON_MOVE_DOWN = "icons/move_down.png"; //$NON-NLS-1$
+	private static final String ICON_MOVE_UP = "icons/move_up.png"; //$NON-NLS-1$
 
 	private final Map<Integer, ECPCellEditorComparator> columnIndexToComparatorMap = new LinkedHashMap<Integer, ECPCellEditorComparator>();
 
@@ -206,13 +212,19 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 	private boolean showValidationSummaryTooltip;
 	private Button addButton;
 	private Button removeButton;
+	private Button moveUpButton;
+	private Button moveDownButton;
 
 	private Optional<Integer> minimumHeight;
 	private Optional<Integer> maximumHeight;
+	private Optional<Integer> visibleLines;
 	private TableControlSWTRendererButtonBarBuilder tableControlSWTRendererButtonBarBuilder;
 	private AbstractTableViewerComposite tableViewerComposite;
 	private int regularColumnsStartIndex;
 	private boolean isDisposing;
+	private IObservableList list;
+	private boolean isFeatureOrdered;
+	private final RunnableManager runnableManager = new RunnableManager(Display.getDefault());
 
 	/**
 	 * Default constructor.
@@ -267,7 +279,7 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			final VDomainModelReference dmrToCheck = getDMRToMultiReference();
 
 			/* get the observable list */
-			final IObservableList list = getEMFFormsDatabinding().getObservableList(dmrToCheck,
+			list = getEMFFormsDatabinding().getObservableList(dmrToCheck,
 				getViewModelContext().getDomainModel());
 
 			/* get the label text/tooltip */
@@ -280,7 +292,7 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			final ECPTableViewerComparator comparator = new ECPTableViewerComparator();
 
 			/* render */
-			final TableViewerCompositeBuilder compositeBuilder = new TableControlSWTRendererCompositeBuilder();
+			final TableViewerCompositeBuilder compositeBuilder = createTableViewerCompositeBuilder();
 			tableControlSWTRendererButtonBarBuilder = new TableControlSWTRendererButtonBarBuilder();
 
 			final TableViewerSWTBuilder tableViewerSWTBuilder = getTableViewerSWTBuilder(parent, list, labelText,
@@ -337,6 +349,17 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 	}
 
 	/**
+	 * Creates the {@link TableViewerCompositeBuilder} used to get Composite hierarchy for this table renderer. This
+	 * method can be overwritten by sub classes to customize the layout.
+	 *
+	 * @return The {@link TableViewerCompositeBuilder}
+	 * @since 1.13
+	 */
+	protected TableViewerCompositeBuilder createTableViewerCompositeBuilder() {
+		return new TableControlSWTRendererCompositeBuilder();
+	}
+
+	/**
 	 * Creates a new {@link TableViewerSWTBuilder}.
 	 *
 	 * @param parent the parent {@link Composite}
@@ -462,6 +485,8 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			: Optional.<Integer> empty();
 		maximumHeight = styleProperty.isSetMaximumHeight() ? Optional.of(styleProperty.getMaximumHeight())
 			: Optional.<Integer> empty();
+		visibleLines = styleProperty.isSetVisibleLines() ? Optional.of(styleProperty.getVisibleLines())
+			: Optional.<Integer> empty();
 	}
 
 	private void addRelayoutListenerIfNeeded(IObservableList list, final Composite composite) {
@@ -681,17 +706,21 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 	 *
 	 * @return the height in px
 	 */
+	// BEGIN COMPLEX CODE
 	protected int getTableHeightHint() {
 		/* if neither min nor max is set we use a fixed height */
-		if (!minimumHeight.isPresent() && !maximumHeight.isPresent()) {
+		if (!minimumHeight.isPresent() && !maximumHeight.isPresent() && !visibleLines.isPresent()) {
 			return 200;
 		}
-
+		// if the visible lines attribute is present, it takes precedence over the minimum & maximum height hints
+		if (visibleLines.isPresent()) {
+			return computeRequiredHeight(visibleLines.get());
+		}
 		if (minimumHeight.isPresent() && maximumHeight.isPresent() && minimumHeight.get() == maximumHeight.get()) {
 			return minimumHeight.get();
 		}
 
-		final int requiredHeight = computeRequiredHeight();
+		final int requiredHeight = computeRequiredHeight(null);
 
 		if (minimumHeight.isPresent() && !maximumHeight.isPresent()) {
 			return requiredHeight < minimumHeight.get() ? minimumHeight.get() : requiredHeight;
@@ -711,8 +740,17 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 
 		return requiredHeight;
 	}
+	// END COMPLEX CODE
 
-	private int computeRequiredHeight() {
+	/**
+	 * Returns the height in pixels required to display the given number of table items. If the visible items are not
+	 * specified, the height required to display all the table items is returned.
+	 *
+	 * @param visibleLines the number of visible table items
+	 * @return the required height
+	 * @since 1.13
+	 */
+	protected int computeRequiredHeight(Integer visibleLines) {
 		if (tableViewer == null) {
 			return SWT.DEFAULT;
 		}
@@ -724,8 +762,13 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			return SWT.DEFAULT;
 		}
 		final int itemHeight = table.getItemHeight();
-		// show one empty row if table does not contain any items
-		final int itemCount = Math.max(table.getItemCount(), 1);
+		// show one empty row if table does not contain any items or visibleLines < 1
+		int itemCount;
+		if (visibleLines != null) {
+			itemCount = Math.max(visibleLines, 1);
+		} else {
+			itemCount = Math.max(table.getItemCount(), 1);
+		}
 		final int headerHeight = table.getHeaderVisible() ? table.getHeaderHeight() : 0;
 		// 4px needed as a buffer to avoid scrollbars
 		final int tableHeight = itemHeight * itemCount + headerHeight + 4;
@@ -743,6 +786,16 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 	}
 
 	/**
+	 * Returns the {@link AbstractTableViewerComposite}.
+	 *
+	 * @return the table viewer composite
+	 * @since 1.13
+	 */
+	protected AbstractTableViewerComposite getTableViewerComposite() {
+		return tableViewerComposite;
+	}
+
+	/**
 	 * Sets the table viewer.
 	 *
 	 * @param tableViewer the viewer
@@ -778,10 +831,26 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			if (getRemoveButton() != null) {
 				getRemoveButton().setEnabled(false);
 			}
+			if (isFeatureOrdered) {
+				if (moveDownButton != null) {
+					moveDownButton.setEnabled(false);
+				}
+				if (moveUpButton != null) {
+					moveUpButton.setEnabled(false);
+				}
+			}
 		} else {
 			if (getRemoveButton() != null) {
 				getRemoveButton().setEnabled(true);
 			}
+			if (isFeatureOrdered) {
+				if (moveDownButton != null) {
+					moveDownButton.setEnabled(true);
+				}
+				if (moveUpButton != null) {
+					moveUpButton.setEnabled(true);
+				}
+			}
 		}
 	}
 
@@ -1004,6 +1073,45 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 		return addButton;
 	}
 
+	private Button createMoveUpButton(final EClass clazz, final Composite buttonComposite, final EObject eObject,
+		final EStructuralFeature structuralFeature) {
+		moveUpButton = new Button(buttonComposite, SWT.None);
+		final Image image = getImage(ICON_MOVE_UP);
+		moveUpButton.setImage(image);
+		final String instanceName = clazz.getInstanceClass() == null ? "" : clazz.getInstanceClass().getSimpleName(); //$NON-NLS-1$
+		moveUpButton.setToolTipText(String.format(
+			LocalizationServiceHelper.getString(TableControlSWTRenderer.class, MessageKeys.TableControl_MoveUp),
+			instanceName));
+
+		final List<?> containments = (List<?>) eObject.eGet(structuralFeature, true);
+		if (!structuralFeature.isOrdered() || containments.size() <= 1) {
+			moveUpButton.setEnabled(false);
+		}
+		isFeatureOrdered = structuralFeature.isOrdered();
+		SWTDataElementIdHelper.setElementIdDataWithSubId(moveUpButton, getVElement(), "table_moveUp", //$NON-NLS-1$
+			getViewModelContext());
+		return moveUpButton;
+	}
+
+	private Button createMoveDownButton(final EClass clazz, final Composite buttonComposite, final EObject eObject,
+		final EStructuralFeature structuralFeature) {
+		moveDownButton = new Button(buttonComposite, SWT.None);
+		final Image image = getImage(ICON_MOVE_DOWN);
+		moveDownButton.setImage(image);
+		final String instanceName = clazz.getInstanceClass() == null ? "" : clazz.getInstanceClass().getSimpleName(); //$NON-NLS-1$
+		moveDownButton.setToolTipText(String.format(
+			LocalizationServiceHelper.getString(TableControlSWTRenderer.class, MessageKeys.TableControl_MoveDown),
+			instanceName));
+
+		final List<?> containments = (List<?>) eObject.eGet(structuralFeature, true);
+		if (!structuralFeature.isOrdered() || containments.size() <= 1) {
+			moveDownButton.setEnabled(false);
+		}
+		SWTDataElementIdHelper.setElementIdDataWithSubId(moveDownButton, getVElement(), "table_moveDown", //$NON-NLS-1$
+			getViewModelContext());
+		return moveDownButton;
+	}
+
 	/**
 	 * This method shows a user confirmation dialog when the user attempts to delete a row in the table.
 	 *
@@ -1129,6 +1237,7 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 		final EObject instance = eObjectToAdd.get();
 		final EditingDomain editingDomain = getEditingDomain(eObject);
 		if (editingDomain == null) {
+			return;
 		}
 		editingDomain.getCommandStack().execute(
 			AddCommand.create(editingDomain, eObject, structuralFeature, instance));
@@ -1137,8 +1246,7 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 
 	@Override
 	protected void applyValidation() {
-		Display.getDefault().asyncExec(new ApplyValidationRunnable());
-
+		runnableManager.executeAsync(new ApplyValidationRunnable());
 	}
 
 	/**
@@ -1201,6 +1309,9 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 		isDisposing = true;
 		rendererGridDescription = null;
 		viewModelDBC.dispose();
+		if (list != null) {
+			list.dispose();
+		}
 		super.dispose();
 	}
 
@@ -1319,6 +1430,18 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 		return editable;
 	}
 
+	private boolean isDisabled(EObject eObject, VDomainModelReference columnDmr) {
+
+		final Optional<VEnablementConfiguration> enablmentConf = TableConfigurationHelper
+			.findEnablementConfiguration(getVElement(), columnDmr);
+
+		if (enablmentConf.isPresent()) {
+			return !enablmentConf.get().isEnabled();
+		}
+
+		return false;
+	}
+
 	/**
 	 * Called by the {@link TableControlEditingSupportAndLabelProvider}.
 	 *
@@ -1537,13 +1660,11 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 				return;
 			}
 			// triggered due to another validation rule before this control is rendered
-			if (validationIcon == null) {
-				return;
-			}
 			// validation rule triggered after the control was disposed
-			if (validationIcon.isDisposed()) {
+			if (validationIcon == null || validationIcon.isDisposed()) {
 				return;
 			}
+
 			// no diagnostic set
 			if (getVElement().getDiagnostic() == null) {
 				return;
@@ -1747,6 +1868,17 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 		@Override
 		public void fillButtonComposite(Composite buttonComposite, AbstractTableViewer viewer) {
 			int numButtons = addButtonsToButtonBar(buttonComposite);
+			if (!getVElement().isMoveUpDownDisabled() && structuralFeature.isOrdered()
+				&& structuralFeature.getUpperBound() != 1) {
+				moveUpButton = createMoveUpButton(
+					clazz, buttonComposite, eObject, structuralFeature);
+				moveDownButton = createMoveDownButton(
+					clazz, buttonComposite, eObject, structuralFeature);
+
+				numButtons = numButtons + 2;
+
+				initMoveUpDownButtons(moveUpButton, moveDownButton, viewer);
+			}
 			if (!getVElement().isAddRemoveDisabled()) {
 				addButton = createAddRowButton(
 					clazz, buttonComposite, eObject, structuralFeature);
@@ -1755,13 +1887,14 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 
 				numButtons = numButtons + 2;
 
-				initButtons(addButton, removeButton, viewer);
+				initAddRemoveButtons(addButton, removeButton, viewer);
 			}
 			GridLayoutFactory.fillDefaults().numColumns(numButtons).equalWidth(false)
 				.applyTo(buttonComposite);
 		}
 
-		private void initButtons(final Button addButton, final Button removeButton, final AbstractTableViewer viewer) {
+		private void initAddRemoveButtons(final Button addButton, final Button removeButton,
+			final AbstractTableViewer viewer) {
 			addButton.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -1778,7 +1911,6 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 				}
 			});
 			removeButton.addSelectionListener(new SelectionAdapter() {
-
 				@Override
 				public void widgetSelected(SelectionEvent e) {
 					final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
@@ -1800,6 +1932,73 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			});
 		}
 
+		private void initMoveUpDownButtons(final Button moveUpButton, final Button moveDownButton,
+			final AbstractTableViewer viewer) {
+			moveUpButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					final List<?> containments = (List<?>) eObject.eGet(structuralFeature, true);
+					final EditingDomain editingDomain = getEditingDomain(eObject);
+
+					@SuppressWarnings({ "rawtypes", "unchecked" })
+					final List<?> moveUpList = new ArrayList(
+						IStructuredSelection.class.cast(tableViewer.getSelection()).toList());
+					sortSelectionBasedOnIndex(moveUpList, containments);
+
+					for (final Object moveUpObject : moveUpList) {
+						final int currentIndex = containments.indexOf(moveUpObject);
+						if (currentIndex <= 0) {
+							return;
+						}
+						editingDomain.getCommandStack()
+							.execute(
+								new MoveCommand(editingDomain, eObject, structuralFeature, currentIndex,
+									currentIndex - 1));
+					}
+				}
+			});
+			moveDownButton.addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					final List<?> containments = (List<?>) eObject.eGet(structuralFeature, true);
+					final EditingDomain editingDomain = getEditingDomain(eObject);
+
+					@SuppressWarnings({ "rawtypes", "unchecked" })
+					final List<?> moveDownList = new ArrayList(
+						IStructuredSelection.class.cast(tableViewer.getSelection()).toList());
+					sortSelectionBasedOnIndex(moveDownList, containments);
+					// need to reverse to avoid the moves interfering each other
+					Collections.reverse(moveDownList);
+
+					final int maxIndex = containments.size() - 1;
+
+					for (final Object moveDownObject : moveDownList) {
+						final int currentIndex = containments.indexOf(moveDownObject);
+						if (currentIndex < 0 || currentIndex == maxIndex) {
+							return;
+						}
+						editingDomain.getCommandStack()
+							.execute(
+								new MoveCommand(editingDomain, eObject, structuralFeature, currentIndex,
+									currentIndex + 1));
+					}
+				}
+			});
+		}
+
+		private void sortSelectionBasedOnIndex(List<?> selection, final List<?> list) {
+			Collections.sort(
+				selection,
+				new Comparator<Object>() {
+					@Override
+					public int compare(Object o1, Object o2) {
+						final int i1 = list.indexOf(o1);
+						final int i2 = list.indexOf(o2);
+						return i1 - i2;
+					}
+				});
+		}
+
 		@Override
 		public Object createNewElement(Button button) {
 			throw new UnsupportedOperationException();
@@ -1810,10 +2009,11 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 	 * {@link org.eclipse.emfforms.spi.swt.table.TableViewerCompositeBuilder TableViewerCompositeBuilder} which calls
 	 * the existing template method to create the validation label.
 	 *
+	 * @since 1.13
+	 *
 	 */
-	@SuppressWarnings("restriction")
-	private final class TableControlSWTRendererCompositeBuilder
-		extends org.eclipse.emfforms.internal.swt.table.DefaultTableViewerCompositeBuilder {
+	protected class TableControlSWTRendererCompositeBuilder
+		extends org.eclipse.emfforms.spi.swt.table.DefaultTableViewerCompositeBuilder {
 		@Override
 		protected Label createValidationLabel(Composite topComposite) {
 			final Label validationLabel = createValidationIcon(topComposite);
@@ -2003,6 +2203,27 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			return getValidationBackgroundColor(diagnostic.size() == 0 ? Diagnostic.OK : diagnostic.get(0)
 				.getSeverity());
 		}
+
+		/**
+		 * @return the cellEditor
+		 */
+		protected CellEditor getCellEditor() {
+			return cellEditor;
+		}
+
+		/**
+		 * @return the feature
+		 */
+		protected EStructuralFeature getFeature() {
+			return feature;
+		}
+
+		/**
+		 * @return the dmr
+		 */
+		protected VDomainModelReference getDmr() {
+			return dmr;
+		}
 	}
 
 	/**
@@ -2049,8 +2270,12 @@ public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableCo
 			final EStructuralFeature structuralFeature = (EStructuralFeature) observableValue.getValueType();
 			final Setting setting = ((InternalEObject) eObject).eSetting(structuralFeature);
 
-			boolean editable = emfFormsEditSupport.canSetProperty(domainModelReference, (EObject) element);
-			editable &= !CellReadOnlyTesterHelper.getInstance().isReadOnly(getVElement(), setting);
+			if (isDisabled(eObject, domainModelReference)
+				|| CellReadOnlyTesterHelper.getInstance().isReadOnly(getVElement(), setting)) {
+				return false;
+			}
+
+			final boolean editable = emfFormsEditSupport.canSetProperty(domainModelReference, (EObject) element);
 
 			if (ECPCellEditor.class.isInstance(cellEditor)) {
 				ECPCellEditor.class.cast(cellEditor).setEditable(editable);
diff --git a/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF
index f55b3f0889..0b71cf270a 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.validation/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Services
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.validation;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.table.internal.validation.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml
index c14540872c..9d2594b024 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.validation/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.table.validation</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
index aaf1ac760e..cff3ac9773 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.template.model.provider.TemplateEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.template.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/plugin.properties b/bundles/org.eclipse.emf.ecp.view.template.model.edit/plugin.properties
index f9f3e81ff0..baf15988ac 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/plugin.properties
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/plugin.properties
@@ -221,3 +221,4 @@ _UI_TabStyleProperty_cancelImageURL_feature = Cancel Image URL
 _UI_TableStyleProperty_showValidationSummaryPopupTooltip_feature = Show Validation Summary Popup Tooltip
 _UI_TableStyleProperty_showValidationSummaryTooltip_feature = Show Validation Summary Tooltip
 _UI_TableStyleProperty_enableSorting_feature = Enable Sorting
+_UI_TableStyleProperty_visibleLines_feature = Visible Lines
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml
index 7abbecb11b..7ff9532ed6 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.template.model.edit</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java
index 0c43abdf40..9051135d09 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java
@@ -70,6 +70,7 @@ public class TableStylePropertyItemProvider
 			addMaximumHeightPropertyDescriptor(object);
 			addShowValidationSummaryTooltipPropertyDescriptor(object);
 			addEnableSortingPropertyDescriptor(object);
+			addVisibleLinesPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -163,6 +164,28 @@ public class TableStylePropertyItemProvider
 	}
 
 	/**
+	 * This adds a property descriptor for the Visible Lines feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addVisibleLinesPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_TableStyleProperty_visibleLines_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_TableStyleProperty_visibleLines_feature", "_UI_TableStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 VTTableStylePropertyPackage.Literals.TABLE_STYLE_PROPERTY__VISIBLE_LINES,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This returns TableStyleProperty.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -201,6 +224,7 @@ public class TableStylePropertyItemProvider
 			case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT:
 			case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP:
 			case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
+			case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__VISIBLE_LINES:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters
index e6bcf7ee48..7616579941 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters
@@ -469,12 +469,24 @@
         </filter>
     </resource>
     <resource path="src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java" type="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty">
+        <filter comment="SPI Changes for 1.13" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+                <message_argument value="getVisibleLines()"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Changes for 1.12" id="403804204">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
                 <message_argument value="isEnableSorting()"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+                <message_argument value="isSetVisibleLines()"/>
+            </message_arguments>
+        </filter>
         <filter comment="Model Additions in 1.12" id="403804204">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
@@ -493,6 +505,18 @@
                 <message_argument value="setShowValidationSummaryTooltip(boolean)"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+                <message_argument value="setVisibleLines(int)"/>
+            </message_arguments>
+        </filter>
+        <filter comment="SPI Changes for 1.13" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+                <message_argument value="unsetVisibleLines()"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java" type="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage">
         <filter comment="Model Additions in 1.12" id="388194388">
@@ -502,6 +526,13 @@
                 <message_argument value="2"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="388194388">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+                <message_argument value="TABLE_STYLE_PROPERTY_FEATURE_COUNT"/>
+                <message_argument value="4"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Changes for 1.12" id="403767336">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
@@ -514,6 +545,12 @@
                 <message_argument value="TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+                <message_argument value="TABLE_STYLE_PROPERTY__VISIBLE_LINES"/>
+            </message_arguments>
+        </filter>
         <filter comment="SPI Changes for 1.12" id="403804204">
             <message_arguments>
                 <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
@@ -526,6 +563,12 @@
                 <message_argument value="getTableStyleProperty_ShowValidationSummaryTooltip()"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="403804204">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+                <message_argument value="getTableStyleProperty_VisibleLines()"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java" type="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage$Literals">
         <filter comment="SPI Changes for 1.12" id="403767336">
@@ -540,6 +583,12 @@
                 <message_argument value="TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP"/>
             </message_arguments>
         </filter>
+        <filter comment="SPI Changes for 1.13" id="403767336">
+            <message_arguments>
+                <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage.Literals"/>
+                <message_argument value="TABLE_STYLE_PROPERTY__VISIBLE_LINES"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationPackage.java" type="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage">
         <filter comment="spi change" id="388194388">
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF
index 6ce6d446cb..92fb9a5920 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/META-INF/MANIFEST.MF
@@ -2,62 +2,53 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.internal.view.template.model.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.internal.view.template.model;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.background.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tab.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="1.12.0",
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.12.0";
-  x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
+Export-Package: org.eclipse.emf.ecp.internal.view.template.model;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.background.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tab.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore b/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore
index de933a1b4f..6b5193a357 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore
@@ -11,5 +11,7 @@
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="enableSorting" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
         defaultValueLiteral="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibleLines" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        unsettable="true"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml
index 4d7ed0a53c..9a4c4a77bb 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.template.model</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java
index 7f6f468c18..65ef9c2a6b 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java
@@ -32,6 +32,8 @@ import org.eclipse.emf.ecp.view.template.model.VTStyleProperty;
  *        <em>Show Validation Summary Tooltip</em>}</li>
  *        <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isEnableSorting
  *        <em>Enable Sorting</em>}</li>
+ *        <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getVisibleLines
+ *        <em>Visible Lines</em>}</li>
  *        </ul>
  *
  * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage#getTableStyleProperty()
@@ -208,7 +210,6 @@ public interface VTTableStyleProperty extends VTStyleProperty {
 	 *
 	 * @since 1.12
 	 *        <!-- end-user-doc -->
-	 *
 	 * @return the value of the '<em>Enable Sorting</em>' attribute.
 	 * @see #setEnableSorting(boolean)
 	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage#getTableStyleProperty_EnableSorting()
@@ -225,11 +226,79 @@ public interface VTTableStyleProperty extends VTStyleProperty {
 	 *
 	 * @since 1.12
 	 *        <!-- end-user-doc -->
-	 *
 	 * @param value the new value of the '<em>Enable Sorting</em>' attribute.
 	 * @see #isEnableSorting()
 	 * @generated
 	 */
 	void setEnableSorting(boolean value);
 
+	/**
+	 * Returns the value of the '<em><b>Visible Lines</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Visible Lines</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return the value of the '<em>Visible Lines</em>' attribute.
+	 * @see #isSetVisibleLines()
+	 * @see #unsetVisibleLines()
+	 * @see #setVisibleLines(int)
+	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage#getTableStyleProperty_VisibleLines()
+	 * @model unsettable="true"
+	 * @generated
+	 */
+	int getVisibleLines();
+
+	/**
+	 * Sets the value of the
+	 * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getVisibleLines
+	 * <em>Visible Lines</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Visible Lines</em>' attribute.
+	 * @see #isSetVisibleLines()
+	 * @see #unsetVisibleLines()
+	 * @see #getVisibleLines()
+	 * @generated
+	 */
+	void setVisibleLines(int value);
+
+	/**
+	 * Unsets the value of the
+	 * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getVisibleLines
+	 * <em>Visible Lines</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @see #isSetVisibleLines()
+	 * @see #getVisibleLines()
+	 * @see #setVisibleLines(int)
+	 * @generated
+	 */
+	void unsetVisibleLines();
+
+	/**
+	 * Returns whether the value of the
+	 * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getVisibleLines
+	 * <em>Visible Lines</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 *
+	 * @return whether the value of the '<em>Visible Lines</em>' attribute is set.
+	 * @see #unsetVisibleLines()
+	 * @see #getVisibleLines()
+	 * @see #setVisibleLines(int)
+	 * @generated
+	 */
+	boolean isSetVisibleLines();
+
 } // VTTableStyleProperty
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java
index ea82a1eaf8..332f031958 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java
@@ -39,7 +39,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNAME = "tableStyleProperty"; //$NON-NLS-1$
@@ -48,7 +48,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.eclipse.org/emf/ecp/view/template/style/table/model"; //$NON-NLS-1$
@@ -57,7 +57,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "org.eclipse.emf.ecp.view.template.style.table.model"; //$NON-NLS-1$
@@ -66,7 +66,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	VTTableStylePropertyPackage eINSTANCE = org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyPackageImpl
@@ -78,7 +78,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * Style Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl
 	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyPackageImpl#getTableStyleProperty()
 	 * @generated
@@ -89,7 +89,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * The feature id for the '<em><b>Minimum Height</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -99,7 +99,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * The feature id for the '<em><b>Maximum Height</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -119,16 +119,26 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Enable Sorting</b></em>' attribute.
 	 * <!-- begin-user-doc -->
-	 * 
+	 *
 	 * @since 1.12
 	 *        <!-- end-user-doc -->
-	 *
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_STYLE_PROPERTY__ENABLE_SORTING = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 3;
 
 	/**
+	 * The feature id for the '<em><b>Visible Lines</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_STYLE_PROPERTY__VISIBLE_LINES = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 4;
+
+	/**
 	 * The number of structural features of the '<em>Table Style Property</em>' class.
 	 * <!-- begin-user-doc -->
 	 *
@@ -137,13 +147,13 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TABLE_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 4;
+	int TABLE_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 5;
 
 	/**
 	 * The number of operations of the '<em>Table Style Property</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -155,7 +165,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Style Property</em>'.
 	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty
 	 * @generated
@@ -168,7 +178,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * <em>Minimum Height</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Minimum Height</em>'.
 	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight()
 	 * @see #getTableStyleProperty()
@@ -182,7 +192,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * <em>Maximum Height</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Maximum Height</em>'.
 	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight()
 	 * @see #getTableStyleProperty()
@@ -221,10 +231,25 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	EAttribute getTableStyleProperty_EnableSorting();
 
 	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getVisibleLines
+	 * <em>Visible Lines</em>}'.
+	 * <!-- begin-user-doc -->
+	 * 
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Visible Lines</em>'.
+	 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getVisibleLines()
+	 * @see #getTableStyleProperty()
+	 * @generated
+	 */
+	EAttribute getTableStyleProperty_VisibleLines();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -241,7 +266,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -251,7 +276,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 		 * <em>Table Style Property</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl
 		 * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyPackageImpl#getTableStyleProperty()
 		 * @generated
@@ -262,7 +287,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Minimum Height</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TABLE_STYLE_PROPERTY__MINIMUM_HEIGHT = eINSTANCE.getTableStyleProperty_MinimumHeight();
@@ -271,7 +296,7 @@ public interface VTTableStylePropertyPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Maximum Height</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT = eINSTANCE.getTableStyleProperty_MaximumHeight();
@@ -297,6 +322,16 @@ public interface VTTableStylePropertyPackage extends EPackage {
 		 */
 		EAttribute TABLE_STYLE_PROPERTY__ENABLE_SORTING = eINSTANCE.getTableStyleProperty_EnableSorting();
 
+		/**
+		 * The meta object literal for the '<em><b>Visible Lines</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * 
+		 * @since 1.13
+		 *        <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_STYLE_PROPERTY__VISIBLE_LINES = eINSTANCE.getTableStyleProperty_VisibleLines();
+
 	}
 
 } // VTTableStylePropertyPackage
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java
index 477f2a6b2d..58e681783f 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java
@@ -35,6 +35,8 @@ import org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableS
  * <em>Show Validation Summary Tooltip</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#isEnableSorting
  * <em>Enable Sorting</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#getVisibleLines
+ * <em>Visible Lines</em>}</li>
  * </ul>
  *
  * @generated
@@ -151,6 +153,40 @@ public class VTTableStylePropertyImpl extends MinimalEObjectImpl.Container imple
 	protected boolean enableSorting = ENABLE_SORTING_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getVisibleLines() <em>Visible Lines</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @see #getVisibleLines()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int VISIBLE_LINES_EDEFAULT = 0;
+
+	/**
+	 * The cached value of the '{@link #getVisibleLines() <em>Visible Lines</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 *
+	 * @since 1.13
+	 *        <!-- end-user-doc -->
+	 * @see #getVisibleLines()
+	 * @generated
+	 * @ordered
+	 */
+	protected int visibleLines = VISIBLE_LINES_EDEFAULT;
+
+	/**
+	 * This is true if the Visible Lines attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean visibleLinesESet;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
@@ -353,6 +389,66 @@ public class VTTableStylePropertyImpl extends MinimalEObjectImpl.Container imple
 	 * @generated
 	 */
 	@Override
+	public int getVisibleLines() {
+		return visibleLines;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setVisibleLines(int newVisibleLines) {
+		final int oldVisibleLines = visibleLines;
+		visibleLines = newVisibleLines;
+		final boolean oldVisibleLinesESet = visibleLinesESet;
+		visibleLinesESet = true;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET,
+				VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__VISIBLE_LINES, oldVisibleLines, visibleLines,
+				!oldVisibleLinesESet));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void unsetVisibleLines() {
+		final int oldVisibleLines = visibleLines;
+		final boolean oldVisibleLinesESet = visibleLinesESet;
+		visibleLines = VISIBLE_LINES_EDEFAULT;
+		visibleLinesESet = false;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.UNSET,
+				VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__VISIBLE_LINES, oldVisibleLines,
+				VISIBLE_LINES_EDEFAULT, oldVisibleLinesESet));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean isSetVisibleLines() {
+		return visibleLinesESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MINIMUM_HEIGHT:
@@ -363,6 +459,8 @@ public class VTTableStylePropertyImpl extends MinimalEObjectImpl.Container imple
 			return isShowValidationSummaryTooltip();
 		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
 			return isEnableSorting();
+		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__VISIBLE_LINES:
+			return getVisibleLines();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -388,6 +486,9 @@ public class VTTableStylePropertyImpl extends MinimalEObjectImpl.Container imple
 		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
 			setEnableSorting((Boolean) newValue);
 			return;
+		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__VISIBLE_LINES:
+			setVisibleLines((Integer) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -413,6 +514,9 @@ public class VTTableStylePropertyImpl extends MinimalEObjectImpl.Container imple
 		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
 			setEnableSorting(ENABLE_SORTING_EDEFAULT);
 			return;
+		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__VISIBLE_LINES:
+			unsetVisibleLines();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -434,6 +538,8 @@ public class VTTableStylePropertyImpl extends MinimalEObjectImpl.Container imple
 			return showValidationSummaryTooltip != SHOW_VALIDATION_SUMMARY_TOOLTIP_EDEFAULT;
 		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
 			return enableSorting != ENABLE_SORTING_EDEFAULT;
+		case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__VISIBLE_LINES:
+			return isSetVisibleLines();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -467,6 +573,12 @@ public class VTTableStylePropertyImpl extends MinimalEObjectImpl.Container imple
 		result.append(showValidationSummaryTooltip);
 		result.append(", enableSorting: "); //$NON-NLS-1$
 		result.append(enableSorting);
+		result.append(", visibleLines: "); //$NON-NLS-1$
+		if (visibleLinesESet) {
+			result.append(visibleLines);
+		} else {
+			result.append("<unset>"); //$NON-NLS-1$
+		}
 		result.append(')');
 		return result.toString();
 	}
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java
index f58bdb1b35..3581379f45 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java
@@ -171,6 +171,17 @@ public class VTTableStylePropertyPackageImpl extends EPackageImpl implements VTT
 	 * @generated
 	 */
 	@Override
+	public EAttribute getTableStyleProperty_VisibleLines() {
+		return (EAttribute) tableStylePropertyEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
 	public VTTableStylePropertyFactory getTableStylePropertyFactory() {
 		return (VTTableStylePropertyFactory) getEFactoryInstance();
 	}
@@ -203,6 +214,7 @@ public class VTTableStylePropertyPackageImpl extends EPackageImpl implements VTT
 		createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT);
 		createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP);
 		createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__ENABLE_SORTING);
+		createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__VISIBLE_LINES);
 	}
 
 	/**
@@ -258,6 +270,9 @@ public class VTTableStylePropertyPackageImpl extends EPackageImpl implements VTT
 		initEAttribute(getTableStyleProperty_EnableSorting(), ecorePackage.getEBoolean(), "enableSorting", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
 			VTTableStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTableStyleProperty_VisibleLines(), ecorePackage.getEInt(), "visibleLines", null, 0, 1, //$NON-NLS-1$
+			VTTableStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
index 852e6abb9c..8bed30b443 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewTemplate Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.template.service.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/viewTemplate.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
index c85b7190f4..63551c268f 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
@@ -7,12 +7,12 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.template.service</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF
index 5215cf3700..dac6aaf3b6 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Template Tooling
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.tooling;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.template.internal.tooling.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.editor;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.editor;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.13.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.100.0,4.0.0)",
@@ -18,22 +18,22 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.editor;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml
index 4752fd78c3..74ac8d22b2 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeValueControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeValueControlSWTRenderer.java
index 534e217910..86b5f0f471 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeValueControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/AttributeValueControlSWTRenderer.java
@@ -57,22 +57,22 @@ import org.osgi.framework.ServiceReference;
  */
 public class AttributeValueControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
-	private static final EMFFormsDatabinding emfFormsDatabinding;
-	private static final EMFFormsLabelProvider emfFormsLabelProvider;
-	private static final VTViewTemplateProvider vtViewTemplateProvider;
+	private static final EMFFormsDatabinding EMFFORMS_DATABINDING;
+	private static final EMFFormsLabelProvider EMFFORMS_LABELPROVIDER;
+	private static final VTViewTemplateProvider VT_VIEW_TEMPLATEPROVIDER;
 
 	static {
 		final BundleContext bundleContext = FrameworkUtil.getBundle(AttributeValueControlSWTRenderer.class)
 			.getBundleContext();
 		final ServiceReference<EMFFormsDatabinding> emfFormsDatabindingServiceReference = bundleContext
 			.getServiceReference(EMFFormsDatabinding.class);
-		emfFormsDatabinding = bundleContext.getService(emfFormsDatabindingServiceReference);
+		EMFFORMS_DATABINDING = bundleContext.getService(emfFormsDatabindingServiceReference);
 		final ServiceReference<EMFFormsLabelProvider> emfFormsLabelProviderServiceReference = bundleContext
 			.getServiceReference(EMFFormsLabelProvider.class);
-		emfFormsLabelProvider = bundleContext.getService(emfFormsLabelProviderServiceReference);
+		EMFFORMS_LABELPROVIDER = bundleContext.getService(emfFormsLabelProviderServiceReference);
 		final ServiceReference<VTViewTemplateProvider> vtViewTemplateProviderServiceReference = bundleContext
 			.getServiceReference(VTViewTemplateProvider.class);
-		vtViewTemplateProvider = bundleContext.getService(vtViewTemplateProviderServiceReference);
+		VT_VIEW_TEMPLATEPROVIDER = bundleContext.getService(vtViewTemplateProviderServiceReference);
 	}
 
 	/**
@@ -84,7 +84,7 @@ public class AttributeValueControlSWTRenderer extends SimpleControlSWTControlSWT
 	 */
 	public AttributeValueControlSWTRenderer(VControl vElement, ViewModelContext viewContext,
 		ReportService reportService) {
-		super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider);
+		super(vElement, viewContext, reportService, EMFFORMS_DATABINDING, EMFFORMS_LABELPROVIDER, VT_VIEW_TEMPLATEPROVIDER);
 	}
 
 	/**
@@ -97,7 +97,7 @@ public class AttributeValueControlSWTRenderer extends SimpleControlSWTControlSWT
 	protected Binding[] createBindings(Control control) throws DatabindingFailedException {
 		final Label label = (Label) Composite.class.cast(control).getChildren()[0];
 		final Binding binding = getDataBindingContext().bindValue(WidgetProperties.text().observe(label),
-			getModelValue(), new UpdateValueStrategy(), new UpdateValueStrategy() {
+			getModelValue(), withPreSetValidation(new UpdateValueStrategy()), new UpdateValueStrategy() {
 
 				/**
 				 * {@inheritDoc}
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java
index 6d11c54790..0f21457fba 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/DMRSelectorControlSWTRenderer.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.eclipse.emf.ecp.view.internal.editor.controls.EditableEReferenceLabelControlSWTRenderer;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emf.ecp.view.spi.model.VControl;
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java
index 7aa567ccca..52b4a56334 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/HexColorSelectionControlSWTRenderer.java
@@ -55,22 +55,22 @@ import org.osgi.framework.ServiceReference;
  */
 public class HexColorSelectionControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
-	private static final EMFFormsDatabinding emfFormsDatabinding;
-	private static final EMFFormsLabelProvider emfFormsLabelProvider;
-	private static final VTViewTemplateProvider vtViewTemplateProvider;
+	private static final EMFFormsDatabinding EMFFORMS_DATABINDING;
+	private static final EMFFormsLabelProvider EMFFORMS_LABELPROVIDER;
+	private static final VTViewTemplateProvider VT_VIEW_TEMPLATEPROVIDER;
 
 	static {
 		final BundleContext bundleContext = FrameworkUtil.getBundle(HexColorSelectionControlSWTRenderer.class)
 			.getBundleContext();
 		final ServiceReference<EMFFormsDatabinding> emfFormsDatabindingServiceReference = bundleContext
 			.getServiceReference(EMFFormsDatabinding.class);
-		emfFormsDatabinding = bundleContext.getService(emfFormsDatabindingServiceReference);
+		EMFFORMS_DATABINDING = bundleContext.getService(emfFormsDatabindingServiceReference);
 		final ServiceReference<EMFFormsLabelProvider> emfFormsLabelProviderServiceReference = bundleContext
 			.getServiceReference(EMFFormsLabelProvider.class);
-		emfFormsLabelProvider = bundleContext.getService(emfFormsLabelProviderServiceReference);
+		EMFFORMS_LABELPROVIDER = bundleContext.getService(emfFormsLabelProviderServiceReference);
 		final ServiceReference<VTViewTemplateProvider> vtViewTemplateProviderServiceReference = bundleContext
 			.getServiceReference(VTViewTemplateProvider.class);
-		vtViewTemplateProvider = bundleContext.getService(vtViewTemplateProviderServiceReference);
+		VT_VIEW_TEMPLATEPROVIDER = bundleContext.getService(vtViewTemplateProviderServiceReference);
 	}
 
 	/**
@@ -82,7 +82,7 @@ public class HexColorSelectionControlSWTRenderer extends SimpleControlSWTControl
 	 */
 	public HexColorSelectionControlSWTRenderer(VControl vElement, ViewModelContext viewContext,
 		ReportService reportService) {
-		super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider);
+		super(vElement, viewContext, reportService, EMFFORMS_DATABINDING, EMFFORMS_LABELPROVIDER, VT_VIEW_TEMPLATEPROVIDER);
 	}
 
 	/**
@@ -97,7 +97,7 @@ public class HexColorSelectionControlSWTRenderer extends SimpleControlSWTControl
 		final Control childControl = composite.getChildren()[0];
 		final IObservableValue value = WidgetProperties.background().observe(childControl);
 		final Binding binding = getDataBindingContext().bindValue(value, getModelValue(),
-			new UpdateValueStrategy() {
+			withPreSetValidation(new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
 					if (value == null) {
@@ -105,7 +105,7 @@ public class HexColorSelectionControlSWTRenderer extends SimpleControlSWTControl
 					}
 					return getString(Color.class.cast(value).getRGB());
 				}
-			}, new UpdateValueStrategy() {
+			}), new UpdateValueStrategy() {
 				@Override
 				public Object convert(Object value) {
 					final String hexString = (String) value;
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java
index 6d8a1b25e7..2a0a660a5e 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/URLSelectionControlSWTRenderer.java
@@ -15,6 +15,7 @@ import java.io.File;
 import java.net.MalformedURLException;
 
 import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.IObserving;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.resources.IResource;
@@ -64,22 +65,22 @@ import org.osgi.framework.ServiceReference;
  */
 public class URLSelectionControlSWTRenderer extends SimpleControlSWTControlSWTRenderer {
 
-	private static final EMFFormsDatabinding emfFormsDatabinding;
-	private static final EMFFormsLabelProvider emfFormsLabelProvider;
-	private static final VTViewTemplateProvider vtViewTemplateProvider;
+	private static final EMFFormsDatabinding EMFFORMS_DATABINDING;
+	private static final EMFFormsLabelProvider EMFFORMS_LABELPROVIDER;
+	private static final VTViewTemplateProvider VT_VIEW_TEMPLATEPROVIDER;
 
 	static {
 		final BundleContext bundleContext = FrameworkUtil.getBundle(URLSelectionControlSWTRenderer.class)
 			.getBundleContext();
 		final ServiceReference<EMFFormsDatabinding> emfFormsDatabindingServiceReference = bundleContext
 			.getServiceReference(EMFFormsDatabinding.class);
-		emfFormsDatabinding = bundleContext.getService(emfFormsDatabindingServiceReference);
+		EMFFORMS_DATABINDING = bundleContext.getService(emfFormsDatabindingServiceReference);
 		final ServiceReference<EMFFormsLabelProvider> emfFormsLabelProviderServiceReference = bundleContext
 			.getServiceReference(EMFFormsLabelProvider.class);
-		emfFormsLabelProvider = bundleContext.getService(emfFormsLabelProviderServiceReference);
+		EMFFORMS_LABELPROVIDER = bundleContext.getService(emfFormsLabelProviderServiceReference);
 		final ServiceReference<VTViewTemplateProvider> vtViewTemplateProviderServiceReference = bundleContext
 			.getServiceReference(VTViewTemplateProvider.class);
-		vtViewTemplateProvider = bundleContext.getService(vtViewTemplateProviderServiceReference);
+		VT_VIEW_TEMPLATEPROVIDER = bundleContext.getService(vtViewTemplateProviderServiceReference);
 	}
 
 	/**
@@ -91,7 +92,8 @@ public class URLSelectionControlSWTRenderer extends SimpleControlSWTControlSWTRe
 	 */
 	public URLSelectionControlSWTRenderer(VControl vElement, ViewModelContext viewContext,
 		ReportService reportService) {
-		super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider);
+		super(vElement, viewContext, reportService, EMFFORMS_DATABINDING, EMFFORMS_LABELPROVIDER,
+			VT_VIEW_TEMPLATEPROVIDER);
 	}
 
 	/**
@@ -105,10 +107,12 @@ public class URLSelectionControlSWTRenderer extends SimpleControlSWTControlSWTRe
 		final Composite composite = Composite.class.cast(control);
 		final Control childControl = composite.getChildren()[0];
 		final IObservableValue value = WidgetProperties.text().observe(childControl);
-		final Binding binding = getDataBindingContext().bindValue(value, getModelValue());
+		final Binding binding = getDataBindingContext().bindValue(value, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy()), null);
 
 		final IObservableValue toolTip = WidgetProperties.tooltipText().observe(childControl);
-		final Binding tooltipBinding = getDataBindingContext().bindValue(toolTip, getModelValue());
+		final Binding tooltipBinding = getDataBindingContext().bindValue(toolTip, getModelValue(),
+			withPreSetValidation(new UpdateValueStrategy()), null);
 		return new Binding[] { binding, tooltipBinding };
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/tooling/editor/TemplateModelEditorPart.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/tooling/editor/TemplateModelEditorPart.java
index 06cb2cfa4a..a39df9413e 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/tooling/editor/TemplateModelEditorPart.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/tooling/editor/TemplateModelEditorPart.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.eclipse.emf.ecp.view.template.internal.tooling.Activator;
 import org.eclipse.emf.ecp.view.template.internal.tooling.Messages;
 import org.eclipse.emf.ecp.view.template.model.VTViewTemplate;
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
index 240f8e37a4..db6c7e85c7 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.treemasterdetail.model.provider.TreeMasterDetailEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml
index f9d66e6621..6cd017dd03 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.model.edit</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
index 973af27e0c..76f23d0a90 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
- org.eclipse.emf.ecp.view.treemasterdetail.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.view.treemasterdetail.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml
index 2ef8c98b26..613cec0ea4 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.model</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
index 48c6a30414..7435ed2eca 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Vertical UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.12.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.12.0";x-internal:=true,
- org.eclipse.emf.edit.ui.action.ecp;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.13.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.edit.ui.action.ecp;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/TreeMasterDetailSWTRendererService.xml
 Bundle-ActivationPolicy: lazy
@@ -26,9 +26,9 @@ Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.dnd;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.13.0,1.14.0)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml
index 5c3568f0c0..f2a9655c2c 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.ui.swt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/src/org/eclipse/emf/ecp/view/spi/treemasterdetail/ui/swt/TreeMasterDetailSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/src/org/eclipse/emf/ecp/view/spi/treemasterdetail/ui/swt/TreeMasterDetailSWTRenderer.java
index c082790a41..ae4bbd362d 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/src/org/eclipse/emf/ecp/view/spi/treemasterdetail/ui/swt/TreeMasterDetailSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/src/org/eclipse/emf/ecp/view/spi/treemasterdetail/ui/swt/TreeMasterDetailSWTRenderer.java
@@ -39,7 +39,6 @@ import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
 import org.eclipse.emf.ecp.edit.spi.ReferenceService;
 import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
 import org.eclipse.emf.ecp.ui.view.ECPRendererException;
-import org.eclipse.emf.ecp.ui.view.swt.DefaultReferenceService;
 import org.eclipse.emf.ecp.ui.view.swt.ECPSWTViewRenderer;
 import org.eclipse.emf.ecp.view.internal.swt.ContextMenuViewModelService;
 import org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt.Activator;
@@ -833,16 +832,6 @@ public class TreeMasterDetailSWTRenderer extends AbstractSWTRenderer<VTreeMaster
 	private class TreeMasterViewSelectionListener implements ISelectionChangedListener {
 
 		private Composite childComposite;
-		private ReferenceService referenceService;
-
-		TreeMasterViewSelectionListener() {
-			// TODO refactor
-			if (getViewModelContext().hasService(ReferenceService.class)) {
-				referenceService = getViewModelContext().getService(ReferenceService.class);
-			} else {
-				referenceService = new DefaultReferenceService();
-			}
-		}
 
 		@Override
 		public void selectionChanged(SelectionChangedEvent event) {
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
index 3e6106f142..4a75f9ba0e 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms TreeMasterDetail Services
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
  org.eclipse.jface.viewers;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml
index 3df11a3bfd..da163901ef 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.validation</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF
index 61869783e1..63a262699c 100644
--- a/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.unset/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Unset Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.unset.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.unset/pom.xml b/bundles/org.eclipse.emf.ecp.view.unset/pom.xml
index bf79141bf7..39c6938c3b 100644
--- a/bundles/org.eclipse.emf.ecp.view.unset/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.unset/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <artifactId>org.eclipse.emf.ecp.view.unset</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

   <groupId>org.eclipse.emf.ecp</groupId>

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF
index 3c0248997d..447e104d39 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Util RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt.rap
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.util.swt.rap.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.rap.rwt;bundle-version="[2.2.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.swt.core.layout;version="1.12.0",
+Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.xml
+Bundle-ActivationPolicy: lazy
+Import-Package: org.eclipse.emfforms.spi.swt.core.layout;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="1.3.0",
  org.osgi.service.component.annotations;version="1.2.0"
-Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
index 295385cce2..46f7f60870 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.util.swt.rap</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
index 5420f29674..2d5071fb13 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Util
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.util.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.util.swt;version="1.13.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/rcpImageRegistry.xml
 Import-Package: org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
index b5bfd4f067..03163367e3 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.util.swt</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
index 221a68af0a..9064fdae7d 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
@@ -2,12 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Bean Validation
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.default;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.validation;version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
index 8837a46ed4..2fd3801544 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.bean.default</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
index 9442faa566..91f4c94644 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms BeanValidation
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.validation.bean.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.validation;version="[1.0.0,2.0.0)",
  javax.validation.bootstrap;version="[1.0.0,2.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
index 0102d04bad..02d5d268c8 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.bean</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean/src/org/eclipse/emf/ecp/view/validation/bean/BeanValidationProvider.java b/bundles/org.eclipse.emf.ecp.view.validation.bean/src/org/eclipse/emf/ecp/view/validation/bean/BeanValidationProvider.java
index 29ba9bc0f8..659ebaa90a 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean/src/org/eclipse/emf/ecp/view/validation/bean/BeanValidationProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean/src/org/eclipse/emf/ecp/view/validation/bean/BeanValidationProvider.java
@@ -41,6 +41,7 @@ import org.eclipse.emf.ecp.view.internal.validation.bean.Activator;
 import org.eclipse.emf.ecp.view.spi.validation.ValidationProvider;
 import org.osgi.framework.Bundle;
 
+// TODO refactor to implement org.eclipse.emfforms.common.spi.validation.Validator instead
 public abstract class BeanValidationProvider implements ValidationProvider {
 
 	private ValidatorContext validatorContext;
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/.project b/bundles/org.eclipse.emf.ecp.view.validation/.project
index d23d9ccab9..5b64aee86b 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/.project
+++ b/bundles/org.eclipse.emf.ecp.view.validation/.project
@@ -1,40 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.emf.ecp.view.validation</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.ecp.view.validation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.ecp.view.validation/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000000..f1a0b6d2a4
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.validation/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=ignore
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
index abb768dfa7..b3d0ade333 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
@@ -2,26 +2,29 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Validation Service
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.validation.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.13.0";
   x-friends:="org.eclipse.emf.ecp.view.table.ui,
    org.eclipse.emf.ecp.view.custom.ui,
    org.eclipse.emf.ecp.edit.swt,
    org.eclipse.emf.ecp.test.model",
- org.eclipse.emf.ecp.view.spi.validation;version="1.12.0"
+ org.eclipse.emf.ecp.view.spi.validation;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
+ org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
+ org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/build.properties b/bundles/org.eclipse.emf.ecp.view.validation/build.properties
index 677e68d4ef..2752abf5e2 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/build.properties
+++ b/bundles/org.eclipse.emf.ecp.view.validation/build.properties
@@ -1,12 +1,12 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               about.html,\

-               about.ini,\

-               about.mappings,\

-               about.properties,\

-               modeling32.png,\

-               schema/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               about.ini,\
+               about.mappings,\
+               about.properties,\
+               modeling32.png,\
+               schema/
+src.includes = about.html
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
index 962a2d81da..2fc60e82e7 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
@@ -7,13 +7,13 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.view.validation</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 

 </project>

diff --git a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationProviderHelper.java b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationProviderHelper.java
new file mode 100644
index 0000000000..a64a5065f1
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationProviderHelper.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * mat - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.validation;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecp.view.spi.validation.ValidationProvider;
+
+/**
+ * Helper class for fetching ECP validators.
+ * See ValidationService#addValidator(org.eclipse.emfforms.common.spi.validation.Validator)
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public final class ValidationProviderHelper {
+
+	private ValidationProviderHelper() {
+	}
+
+	/**
+	 * Fetch all known ECP validators using the ECP validationProvider extension point.
+	 *
+	 * @return the validators found
+	 */
+	public static Set<ValidationProvider> fetchValidationProviders() {
+		final Set<ValidationProvider> providers = new LinkedHashSet<ValidationProvider>();
+
+		final IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
+		if (extensionRegistry == null) {
+			return providers;
+		}
+		final IConfigurationElement[] controls = extensionRegistry
+			.getConfigurationElementsFor("org.eclipse.emf.ecp.view.validation.validationProvider"); //$NON-NLS-1$
+		for (final IConfigurationElement e : controls) {
+			try {
+				final ValidationProvider provider = (ValidationProvider) e.createExecutableExtension("class"); //$NON-NLS-1$
+				providers.add(provider);
+			} catch (final CoreException e1) {
+				Activator.logException(e1);
+			}
+		}
+		return providers;
+	}
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java
index 7a14c9c60c..0b30ab63cb 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java
@@ -22,29 +22,23 @@ import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import org.eclipse.core.databinding.observable.IObserving;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider;
 import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.ecore.util.EObjectValidator;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecp.common.spi.UniqueSetting;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
@@ -61,6 +55,9 @@ import org.eclipse.emf.ecp.view.spi.validation.ValidationService;
 import org.eclipse.emf.ecp.view.spi.validation.ViewValidationListener;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emfforms.common.internal.validation.DiagnosticHelper;
+import org.eclipse.emfforms.common.spi.validation.ValidationResultListener;
+import org.eclipse.emfforms.common.spi.validation.filter.AbstractSimpleFilter;
 import org.eclipse.emfforms.spi.common.report.AbstractReport;
 import org.eclipse.emfforms.spi.core.services.controlmapper.EMFFormsSettingToControlMapper;
 import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
@@ -68,6 +65,9 @@ import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedRepor
 import org.eclipse.emfforms.spi.core.services.mappingprovider.EMFFormsMappingProviderManager;
 import org.eclipse.emfforms.spi.core.services.view.EMFFormsContextListener;
 import org.eclipse.emfforms.spi.core.services.view.EMFFormsViewContext;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 /**
  * Validation service that, once instantiated, synchronizes the validation result of a model element with its
@@ -137,7 +137,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 
 			final EObject observed = (EObject) ((IObserving) observableValue).getObserved();
 			// validate(observed);
-			// TODO: add test case fo this
+			// TODO: add test case for this
 			final Set<EObject> eObjectsToValidate = new LinkedHashSet<EObject>();
 			eObjectsToValidate.add(observed);
 			final EStructuralFeature structuralFeature = (EStructuralFeature) observableValue.getValueType();
@@ -323,7 +323,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 
 	}
 
-	private final Set<ValidationProvider> validationProviders = new LinkedHashSet<ValidationProvider>();
+	private org.eclipse.emfforms.common.spi.validation.ValidationService validationService;
 	private ValidationDomainModelChangeListener domainChangeListener;
 	private ViewModelChangeListener viewChangeListener;
 	private ViewModelContext context;
@@ -331,6 +331,8 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 	private final Set<EObject> validated = new LinkedHashSet<EObject>();
 	private boolean validationRunning;
 	private final Map<UniqueSetting, VDiagnostic> currentUpdates = new LinkedHashMap<UniqueSetting, VDiagnostic>();
+	private ComposedAdapterFactory adapterFactory;
+	private final Timer timer = new Timer();
 
 	/**
 	 * {@inheritDoc}
@@ -354,14 +356,53 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 			throw new IllegalStateException("Domain model must not be null"); //$NON-NLS-1$
 		}
 
-		readValidationProvider();
+		validationService = new org.eclipse.emfforms.common.internal.validation.ValidationServiceImpl();
+		validationService.registerValidationFilter(new AbstractSimpleFilter() {
+			@Override
+			public boolean skipValidation(EObject eObject) {
+				return validated.contains(eObject);
+			}
+
+			@Override
+			public boolean ignoreDiagnostic(EObject eObject, Diagnostic diagnostic) {
+				return !controlMapper.hasControlsFor(eObject);
+			}
+		});
+		validationService.registerValidationResultListener(new ValidationResultListener() {
+			@Override
+			public void onValidate(EObject eObject, Diagnostic diagnostic) {
+				validated.add(eObject);
+			}
+
+			@Override
+			public void afterValidate(EObject eObject, Diagnostic diagnostic) {
+				// nothing to do here
+			}
+		});
+
+		adapterFactory = new ComposedAdapterFactory(new AdapterFactory[] {
+			new ReflectiveItemProviderAdapterFactory(),
+			new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE) });
+
+		final ViewSubstitutionLabelProviderFactory substitutionLabelProviderFactory = getSubstitutionLabelProviderFactory();
+
+		SubstitutionLabelProvider substitutionLabelProvider;
+		if (substitutionLabelProviderFactory != null) {
+			substitutionLabelProvider = substitutionLabelProviderFactory
+				.createSubstitutionLabelProvider(adapterFactory);
+		} else {
+			substitutionLabelProvider = new ECPSubstitutionLabelProvider(adapterFactory);
+		}
+
+		validationService.setSubstitutionLabelProvider(substitutionLabelProvider);
+
+		registerValidationProviders();
 
 		domainChangeListener = new ValidationDomainModelChangeListener();
 		viewChangeListener = new ViewModelChangeListener();
 		context.registerDomainChangeListener(domainChangeListener);
 		context.registerViewChangeListener(viewChangeListener);
 		context.registerEMFFormsContextListener(this);
-		// validate(getAllEObjects(domainModel));
 	}
 
 	private void cleanControlDiagnostics(EObject parent, EReference parentReference, EObject removedEObject) {
@@ -383,7 +424,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 				if (diagnostic.getData().size() < 1) {
 					continue;
 				}
-				if (removedEObject.equals(getFirstInternalEObject(diagnostic.getData()))) {
+				if (removedEObject.equals(DiagnosticHelper.getFirstInternalEObject(diagnostic.getData()))) {
 					diagnosticsToRemove.add(diagnostic);
 				}
 			}
@@ -391,20 +432,9 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 		}
 	}
 
-	private void readValidationProvider() {
-		final IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		if (extensionRegistry == null) {
-			return;
-		}
-		final IConfigurationElement[] controls = extensionRegistry
-			.getConfigurationElementsFor("org.eclipse.emf.ecp.view.validation.validationProvider"); //$NON-NLS-1$
-		for (final IConfigurationElement e : controls) {
-			try {
-				final ValidationProvider validationProvider = (ValidationProvider) e.createExecutableExtension("class"); //$NON-NLS-1$
-				validationProviders.add(validationProvider);
-			} catch (final CoreException e1) {
-				Activator.logException(e1);
-			}
+	private void registerValidationProviders() {
+		for (final ValidationProvider provider : ValidationProviderHelper.fetchValidationProviders()) {
+			validationService.addValidator(provider);
 		}
 	}
 
@@ -418,6 +448,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 		context.unregisterEMFFormsContextListener(this);
 		context.unregisterDomainChangeListener(domainChangeListener);
 		context.unregisterViewChangeListener(viewChangeListener);
+		adapterFactory.dispose();
 	}
 
 	/**
@@ -461,16 +492,8 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 	 */
 	@Override
 	public void validate(Collection<EObject> eObjects) {
-
-		for (final EObject eObject : eObjects) {
-			if (validated.contains(eObject)) {
-				continue;
-			}
-			validated.add(eObject);
-			validationQueue.offer(eObject);
-		}
+		validationQueue.addAll(eObjects);
 		processValidationQueue();
-
 	}
 
 	/**
@@ -479,25 +502,31 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 	 * @param eObject the eObject to validate
 	 */
 	public void validate(EObject eObject) {
-		if (!validated.contains(eObject)) {
-			validated.add(eObject);
-			validationQueue.offer(eObject);
-			processValidationQueue();
-		}
+		/**
+		 * We are using a queue here to allow validators to add additional eObjects
+		 * to the current validation run. This is because we actually want a diagnostics aggregate,
+		 * otherwise consecutive runs would replace already existing diagnostics on the UI.
+		 * This is probably not the best way to solve this problem, but it will do for now.
+		 */
+		validationQueue.offer(eObject);
+		processValidationQueue();
 	}
 
 	private void processValidationQueue() {
 		if (!initialized) {
 			return;
 		}
-		// prohibit reentry in recursion
+		// prohibit re-entry in recursion
 		if (validationRunning) {
 			return;
 		}
 		validationRunning = true;
 		EObject toValidate;
 		while ((toValidate = validationQueue.poll()) != null) {
+			final ValidationTimerTask timerTask = new ValidationTimerTask(toValidate);
+			timer.schedule(timerTask, 1000);
 			validateAndCollectSettings(toValidate);
+			timerTask.cancel();
 		}
 		update();
 		notifyListeners();
@@ -546,8 +575,9 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 					if (diagnostic.getData().size() < 2) {
 						continue;
 					}
-					final EObject diagnosticEobject = getFirstInternalEObject(diagnostic.getData());
-					final EStructuralFeature eStructuralFeature = getFirstEStructuralFeature(diagnostic.getData());
+					final EObject diagnosticEobject = DiagnosticHelper.getFirstInternalEObject(diagnostic.getData());
+					final EStructuralFeature eStructuralFeature = DiagnosticHelper
+						.getEStructuralFeature(diagnostic.getData());
 					if (diagnosticEobject == null || eStructuralFeature == null) {
 						continue;
 					}
@@ -566,7 +596,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 			}
 		}
 
-		updateAndPropagate(controlDiagnosticMap);
+		 updateAndPropagate(controlDiagnosticMap);
 	}
 
 	private boolean isObjectStillValid(EObject diagnosticEobject) {
@@ -613,7 +643,10 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 	}
 
 	private void validateAndCollectSettings(EObject eObject) {
-		final Diagnostic diagnostic = getDiagnosticForEObject(eObject);
+		final Diagnostic diagnostic = validationService.validate(eObject);
+		if (diagnostic == null) { // happens if the eObject is being filtered
+			return;
+		}
 		for (final EStructuralFeature feature : eObject.eClass().getEAllStructuralFeatures()) {
 			final UniqueSetting uniqueSetting = UniqueSetting.createSetting(eObject, feature);
 			if (!currentUpdates.containsKey(uniqueSetting)) {
@@ -621,14 +654,13 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 			}
 		}
 		analyzeDiagnostic(diagnostic);
-
 	}
 
 	private void analyzeDiagnostic(Diagnostic diagnostic) {
 		if (diagnostic.getData().size() > 1) {
 
-			final InternalEObject internalEObject = getFirstInternalEObject(diagnostic.getData());
-			final EStructuralFeature eStructuralFeature = getFirstEStructuralFeature(diagnostic.getData());
+			final InternalEObject internalEObject = DiagnosticHelper.getFirstInternalEObject(diagnostic.getData());
+			final EStructuralFeature eStructuralFeature = DiagnosticHelper.getEStructuralFeature(diagnostic.getData());
 			if (internalEObject == null || eStructuralFeature == null) {
 				return;
 			}
@@ -655,84 +687,6 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 		}
 	}
 
-	private EStructuralFeature getFirstEStructuralFeature(List<?> data) {
-		// Exclude first object for cases when we validate an EStructuralFeature.
-		for (final Object object : data.subList(1, data.size())) {
-			if (EStructuralFeature.class.isInstance(object)) {
-				return EStructuralFeature.class.cast(object);
-			}
-		}
-		return null;
-	}
-
-	private InternalEObject getFirstInternalEObject(List<?> data) {
-		for (final Object object : data) {
-			if (InternalEObject.class.isInstance(object)) {
-				return InternalEObject.class.cast(object);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Computes the {@link Diagnostic} for the given eObject.
-	 *
-	 * @param object the eObject to validate
-	 * @return the diagnostic
-	 */
-	public Diagnostic getDiagnosticForEObject(EObject object) {
-		EValidator validator = EValidator.Registry.INSTANCE.getEValidator(object.eClass().getEPackage());
-		final BasicDiagnostic diagnostics = Diagnostician.INSTANCE.createDefaultDiagnostic(object);
-
-		if (validator == null) {
-			validator = new EObjectValidator();
-		}
-		final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(new AdapterFactory[] {
-			new ReflectiveItemProviderAdapterFactory(),
-			new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE) });
-		final Map<Object, Object> context = new LinkedHashMap<Object, Object>();
-		context.put(EValidator.SubstitutionLabelProvider.class, new ECPSubstitutionLabelProvider(adapterFactory));
-		context.put(EValidator.class, validator);
-
-		validator.validate(object, diagnostics, context);
-
-		adapterFactory.dispose();
-
-		final Map<EStructuralFeature, DiagnosticChain> diagnosticMap = new LinkedHashMap<EStructuralFeature, DiagnosticChain>();
-		for (final Diagnostic child : diagnostics.getChildren()) {
-			if (DiagnosticChain.class.isInstance(child) && checkDiagnosticData(child)) {
-				diagnosticMap.put(getFirstEStructuralFeature(child.getData()), (DiagnosticChain) child);
-			}
-		}
-
-		for (final ValidationProvider validationProvider : validationProviders) {
-			final List<Diagnostic> additionValidation = validationProvider.validate(object);
-			for (final Diagnostic additionDiagnostic : additionValidation) {
-				if (diagnosticMap.containsKey(getFirstEStructuralFeature(additionDiagnostic.getData()))) {
-					diagnosticMap.get(getFirstEStructuralFeature(additionDiagnostic.getData())).add(additionDiagnostic);
-				} else {
-					diagnostics.add(additionDiagnostic);
-				}
-
-			}
-		}
-		return diagnostics;
-	}
-
-	private boolean checkDiagnosticData(Diagnostic diagnostic) {
-		final List<?> data = diagnostic.getData();
-		if (data.size() < 2) {
-			return false;
-		}
-		if (getFirstInternalEObject(data) == null) {
-			return false;
-		}
-		if (getFirstEStructuralFeature(data) == null) {
-			return false;
-		}
-		return true;
-	}
-
 	/**
 	 *
 	 * {@inheritDoc}
@@ -752,7 +706,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 	 */
 	@Override
 	public void addValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
-		validationProviders.add(validationProvider);
+		validationService.addValidator(validationProvider);
 		if (revalidate) {
 			validate(getAllEObjectsToValidate());
 		}
@@ -777,7 +731,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 	 */
 	@Override
 	public void removeValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
-		validationProviders.remove(validationProvider);
+		validationService.removeValidator(validationProvider);
 		if (revalidate) {
 			validate(getAllEObjectsToValidate());
 		}
@@ -840,6 +794,7 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 	@Override
 	public void childContextAdded(VElement parentElement, EMFFormsViewContext childContext) {
 		validate(getAllEObjectsToValidate());
+		childContext.registerViewChangeListener(viewChangeListener);
 	}
 
 	/**
@@ -874,4 +829,60 @@ public class ValidationServiceImpl implements ValidationService, EMFFormsContext
 		// do nothing
 	}
 
+	/**
+	 * Returns a {@link ViewSubstitutionLabelProviderFactory}, if any is registered.
+	 *
+	 * @return an instance of a {@link ViewSubstitutionLabelProviderFactory}, if any is available,
+	 *         {@code null} otherwise
+	 */
+	protected ViewSubstitutionLabelProviderFactory getSubstitutionLabelProviderFactory() {
+		final BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+		final ServiceReference<ViewSubstitutionLabelProviderFactory> serviceReference = bundleContext
+			.getServiceReference(ViewSubstitutionLabelProviderFactory.class);
+
+		if (serviceReference == null) {
+			return null;
+		}
+
+		final ViewSubstitutionLabelProviderFactory labelProviderFactory = bundleContext
+			.getService(serviceReference);
+		bundleContext.ungetService(serviceReference);
+		return labelProviderFactory;
+	}
+
+	/**
+	 * TimerTask that reports that the validation is taking longer than expected. This task should be cancelled when
+	 * the validation is done.
+	 */
+	class ValidationTimerTask extends TimerTask {
+
+		private boolean cancelled;
+		private final EObject validatedEObject;
+
+		/**
+		 * Constructor.
+		 *
+		 * @param validatedEObject the EObject being validated
+		 */
+		ValidationTimerTask(EObject validatedEObject) {
+			super();
+			this.validatedEObject = validatedEObject;
+		}
+
+		@Override
+		public void run() {
+			if (!cancelled) {
+				Activator.getDefault().getReportService()
+					.report(new AbstractReport(MessageFormat.format(
+						"Validation took longer than expected for EObject {0}", validatedEObject, //$NON-NLS-1$
+						IStatus.INFO)));
+			}
+		}
+
+		@Override
+		public boolean cancel() {
+			cancelled = true;
+			return super.cancel();
+		}
+	}
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ViewSubstitutionLabelProviderFactory.java b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ViewSubstitutionLabelProviderFactory.java
new file mode 100644
index 0000000000..bac9007c3c
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ViewSubstitutionLabelProviderFactory.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Muller, Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.validation;
+
+import org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+
+/**
+ * Factory interface for obtaining an instance of an {@link SubstitutionLabelProvider}.
+ *
+ */
+public interface ViewSubstitutionLabelProviderFactory {
+
+	/**
+	 * Create a {@link SubstitutionLabelProvider}.
+	 *
+	 * @param factory the {@link ComposedAdapterFactory} that the {@link SubstitutionLabelProvider}
+	 *            can delegate to if necessary
+	 * @return the created label provider
+	 */
+	SubstitutionLabelProvider createSubstitutionLabelProvider(ComposedAdapterFactory factory);
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationProvider.java b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationProvider.java
index 44feda46ca..4852b271f2 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationProvider.java
@@ -11,26 +11,17 @@
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.spi.validation;
 
-import java.util.List;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emfforms.common.spi.validation.Validator;
 
 /**
- * The ValidationService calls the providers after the validation with emf. By providing an own provider, one can extend
- * the EMF validation by providing additional validation rules.
+ * The ValidationService calls the providers after the validation with EMF.
+ * By providing an own provider, one can extend the EMF validation by providing additional validation rules.
  *
  * @author Eugen Neufeld
  * @since 1.5
  *
  */
-public interface ValidationProvider {
+// TODO mark as deprecated
+public interface ValidationProvider extends Validator {
 
-	/**
-	 * Method is called by the {@link ValidationService} to get addition validation information for an {@link EObject}.
-	 *
-	 * @param eObject the {@link EObject} to validate
-	 * @return the List of additional {@link Diagnostic Diagnostics} for the {@link EObject}
-	 */
-	List<Diagnostic> validate(EObject eObject);
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationService.java b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationService.java
index 857d4aec65..4bed03cc50 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationService.java
+++ b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ValidationService.java
@@ -79,5 +79,6 @@ public interface ValidationService extends GlobalViewModelService {
 	 *
 	 * @param eObjects the eObjects to validate
 	 */
+	// TODO this should be refactored to use an iterator rather than a collection
 	void validate(Collection<EObject> eObjects);
 }
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ViewValidationListener.java b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ViewValidationListener.java
index a76c025c2c..210d988d39 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ViewValidationListener.java
+++ b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/spi/validation/ViewValidationListener.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.common.util.Diagnostic;
  */
 public interface ViewValidationListener {
 
+	// TODO this comment doesn't really fit to the actual functionality (imho)
 	/**
 	 * Returns validation results if the validation severity is higher than {@link Diagnostic#OK}. If there are no
 	 * severities higher than OK an empty Set is returned.
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
index 72b0e575a7..23c9269836 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.spi.vertical.model.provider.VerticalEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
index 2d93f721e9..65bb922601 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.vertical.model.edit</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
index 2e80e83c41..fa64e7f2ad 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
index cf6b7ff390..2d79875cf1 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emf.ecp.view.vertical.model</artifactId>
   <packaging>eclipse-plugin</packaging>
 
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <groupId>org.eclipse.emf.ecp</groupId>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
index fdf23835db..824bb18776 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Vertical UI SWT
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
index b5c15751bd..3cfca66816 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
index 836bd697ac..f7495c9572 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider.ViewproxyEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
index 752609c24e..077a34e76c 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
index 07b8ee9870..ffd85f1346 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.12.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.13.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
index 9d156da8e2..b75608c1cc 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
index d3dd4abea1..5a8dab4940 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewModel Workspace Migrator
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.workspace.migrator;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
index 884c7a035d..35ec0c8478 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.workspace.migrator</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
index 50f616e7a2..e3c55ec765 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Workspace Integration Core
 Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.core;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.core.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.internal.core;version="1.12.0";x-friends:="org.eclipse.emf.ecp.workspace.ui,org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.workspace.internal.core;version="1.13.0";x-friends:="org.eclipse.emf.ecp.workspace.ui,org.eclipse.emf.ecp.ui.view.editor.controls"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
index e8d75bf749..b28fc5a7d7 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.workspace.core</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
index 8747eaaa77..015c74bffd 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
@@ -2,18 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Workspace Integration UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.ui.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.jface.action;version="0.0.0",
@@ -21,9 +20,12 @@ Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
  org.eclipse.jface.window;version="0.0.0",
+ org.eclipse.jface.wizard;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
+ org.eclipse.swt.custom;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
  org.eclipse.swt.graphics;version="0.0.0",
+ org.eclipse.swt.layout;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.eclipse.ui;ui.workbench=split;version="0.0.0",
  org.eclipse.ui.actions;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
index 868d0d150c..ea9c3625f3 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.workspace.ui</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
index f36c92029c..1cbbc87e89 100644
--- a/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Minimal RAP EMF Edit UI
 Bundle-SymbolicName: org.eclipse.emf.rap.edit.ui.minimal
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.edit.ui.provider.Activator
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.edit.ui.dnd;version="2.10.0",
diff --git a/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml b/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
index 193e4f26d5..0b3a7d8d09 100644
--- a/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
+++ b/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.rap.edit.ui.minimal</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.checkstyle b/bundles/org.eclipse.emfforms.common.prevalidation/.checkstyle
new file mode 100644
index 0000000000..19c54776c3
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+    <file-match-pattern match-pattern=".java" include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.classpath b/bundles/org.eclipse.emfforms.common.prevalidation/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.gitignore b/bundles/org.eclipse.emfforms.common.prevalidation/.gitignore
new file mode 100644
index 0000000000..ae3c172604
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.project b/bundles/org.eclipse.emfforms.common.prevalidation/.project
new file mode 100644
index 0000000000..bc0389ecbc
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emfforms.common.prevalidation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/.api_filters b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/.api_filters
new file mode 100644
index 0000000000..41f05bf95a
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/.api_filters
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emfforms.common.prevalidation" version="2">
+    <resource path="src/org/eclipse/emfforms/internal/common/prevalidation/PreSetValidationServiceImpl.java" type="org.eclipse.emfforms.internal.common.prevalidation.PreSetValidationServiceImpl">
+        <filter id="576725006">
+            <message_arguments>
+                <message_argument value="PreSetValidationService"/>
+                <message_argument value="PreSetValidationServiceImpl"/>
+            </message_arguments>
+        </filter>
+        <filter comment="internal API usage" id="643846161">
+            <message_arguments>
+                <message_argument value="IFeatureConstraint"/>
+                <message_argument value="PreSetValidationServiceImpl"/>
+                <message_argument value="addConstraintValidator(EDataType, IFeatureConstraint)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..66c53c11ad
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,419 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..8bc4bb4b36
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..864e30fe5d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..cc2c0255cd
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,98 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..8be910747b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Pre-Set Validation
+Bundle-SymbolicName: org.eclipse.emfforms.common.prevalidation
+Bundle-Version: 1.13.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Export-Package: org.eclipse.emfforms.internal.common.prevalidation;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Service-Component: OSGI-INF/PreSetValidationServiceImpl.xml
+Bundle-ActivationPolicy: lazy
+Import-Package: org.osgi.framework;version="1.8.0",
+ org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/OSGI-INF/PreSetValidationServiceImpl.xml b/bundles/org.eclipse.emfforms.common.prevalidation/OSGI-INF/PreSetValidationServiceImpl.xml
new file mode 100644
index 0000000000..e1e8a172c5
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/OSGI-INF/PreSetValidationServiceImpl.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="PreSetValidationServiceImpl">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.common.validation.PreSetValidationService"/>
+   </service>
+   <implementation class="org.eclipse.emfforms.internal.common.prevalidation.PreSetValidationServiceImpl"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/about.html b/bundles/org.eclipse.emfforms.common.prevalidation/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/build.properties b/bundles/org.eclipse.emfforms.common.prevalidation/build.properties
new file mode 100644
index 0000000000..30c35d74ee
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html
+src.includes = about.html
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml b/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
new file mode 100644
index 0000000000..b3f8de9c9c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.emf.ecp</groupId>
+    <artifactId>ecp-bundles-parent</artifactId>
+    <version>1.13.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.emf.ecp</groupId>
+  <artifactId>org.eclipse.emfforms.common.prevalidation</artifactId>
+  <version>1.13.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/src/org/eclipse/emfforms/internal/common/prevalidation/PreSetValidationServiceImpl.java b/bundles/org.eclipse.emfforms.common.prevalidation/src/org/eclipse/emfforms/internal/common/prevalidation/PreSetValidationServiceImpl.java
new file mode 100644
index 0000000000..c1e549dc40
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/src/org/eclipse/emfforms/internal/common/prevalidation/PreSetValidationServiceImpl.java
@@ -0,0 +1,307 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.common.prevalidation;
+
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.util.Diagnostician;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emf.ecore.util.EObjectValidator.DynamicEDataTypeValidator;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.ExtendedMetaData;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.emfforms.spi.common.validation.IFeatureConstraint;
+import org.eclipse.emfforms.spi.common.validation.PreSetValidationService;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+
+/**
+ * Implementation of the {@link PreSetValidationService}.
+ *
+ * @author emueller
+ *
+ */
+@Component(name = "PreSetValidationServiceImpl", service = PreSetValidationService.class)
+public class PreSetValidationServiceImpl implements PreSetValidationService {
+
+	private static final String LOOSE_PATTERN_KEY = "loosePattern"; //$NON-NLS-1$
+	private static final String LOOSE_MIN_LENGTH = "looseMinLength"; //$NON-NLS-1$
+	private static final String MULTI_LITERAL_SEP = "|"; //$NON-NLS-1$
+	private static final String ESCAPED_MULTI_LITERAL_SEP = "\\|"; //$NON-NLS-1$
+
+	private Map<ENamedElement, Set<IFeatureConstraint>> constraints = //
+		new LinkedHashMap<ENamedElement, Set<IFeatureConstraint>>();
+
+	@Override
+	public Diagnostic validate(final EStructuralFeature eStructuralFeature, Object value) {
+		return validate(eStructuralFeature, value, null);
+	}
+
+	@Override
+	public Diagnostic validate(final EStructuralFeature eStructuralFeature, Object value, Map<Object, Object> context) {
+		return validate(
+			new PreSetValidator() {
+				@Override
+				public boolean validate(EDataType eDataType, Object value, DiagnosticChain diagnostics,
+					Map<Object, Object> context) {
+					EValidator validator = EValidator.Registry.INSTANCE
+						.getEValidator(eStructuralFeature.getEType().getEPackage());
+					if (validator == null) {
+						validator = new EObjectValidator();
+					}
+					return validator.validate(eDataType, value, diagnostics, context);
+				}
+			},
+			eStructuralFeature,
+			value,
+			context);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emfforms.spi.common.validation.PreSetValidationService#validateLoose(org.eclipse.emf.ecore.EStructuralFeature,
+	 *      java.lang.Object)
+	 */
+	@Override
+	public Diagnostic validateLoose(EStructuralFeature eStructuralFeature, Object value) {
+		final EClassifier eType = eStructuralFeature.getEType();
+
+		if (!EDataType.class.isInstance(eType) || EDataType.class.cast(eType).getEPackage() == EcorePackage.eINSTANCE) {
+			return new BasicDiagnostic();
+		}
+
+		return validate(
+			new DynamicLoosePatternEValidator(new LooseEValidator(), (EDataType) eType),
+			eStructuralFeature,
+			value,
+			null);
+	}
+
+	@SuppressWarnings("unchecked")
+	private Diagnostic validate(PreSetValidator validator, EStructuralFeature eStructuralFeature, Object value,
+		Map<Object, Object> context) {
+		final EClassifier eType = eStructuralFeature.getEType();
+
+		BasicDiagnostic diagnostics = new BasicDiagnostic();
+
+		if (eType instanceof EDataType && EDataType.class.cast(eType).getEPackage() != EcorePackage.eINSTANCE) {
+
+			final EDataType eDataType = EDataType.class.cast(eType);
+			diagnostics = Diagnostician.INSTANCE.createDefaultDiagnostic(eDataType, value);
+
+			// try to validate given value as enum literal
+			if (eDataType instanceof EEnum && value instanceof String) {
+				if (validateEEnum((EEnum) eDataType, (String) value)) {
+					return new BasicDiagnostic();
+				}
+			} else if (eDataType instanceof EEnum && value instanceof List<?>) {
+				try {
+					if (validateEEnum((EEnum) eDataType, (List<Enumerator>) value)) {
+						return new BasicDiagnostic();
+					}
+				} catch (final ClassCastException ex) {
+					// ignore and continue with regular validation
+				}
+			}
+
+			if (validator != null) {
+				validator.validate(eDataType, value, diagnostics, context);
+			}
+
+		}
+
+		executeValidators(diagnostics, constraints.get(eType),
+			eStructuralFeature, value, context);
+
+		executeValidators(diagnostics, constraints.get(eStructuralFeature),
+			eStructuralFeature, value, context);
+
+		return diagnostics;
+	}
+
+	private static boolean validateEEnum(final EEnum eEnum, final String valueString) {
+		if (valueString.contains(MULTI_LITERAL_SEP)) {
+			boolean isValid = true;
+			final String[] literals = valueString.split(ESCAPED_MULTI_LITERAL_SEP);
+			for (final String literal : literals) {
+				isValid &= validateLiteral(eEnum, literal.trim());
+			}
+			return isValid;
+		}
+		return validateLiteral(eEnum, valueString);
+	}
+
+	private static boolean validateEEnum(final EEnum eEnum, final List<Enumerator> enumerators) {
+		boolean isValid = true;
+		for (final Enumerator enumerator : enumerators) {
+			isValid &= validateLiteral(eEnum, enumerator.getLiteral());
+		}
+		return isValid;
+	}
+
+	private static Optional<String> findLooseConstraint(EDataType eDataType, String looseConstrainKey) {
+		return Optional
+			.ofNullable(EcoreUtil.getAnnotation(eDataType, ExtendedMetaData.ANNOTATION_URI, looseConstrainKey));
+	}
+
+	private static boolean validateLiteral(EEnum eEnum, String literal) {
+		for (final EEnumLiteral enumLiteral : eEnum.getELiterals()) {
+			if (literal.equals(enumLiteral.getLiteral())) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private static void executeValidators(BasicDiagnostic diagnostics, Set<IFeatureConstraint> constraints,
+		EStructuralFeature eStructuralFeature, Object value, Map<Object, Object> context) {
+
+		if (constraints == null) {
+			return;
+		}
+
+		for (final IFeatureConstraint constraint : constraints) {
+			final Diagnostic result = constraint.validate(eStructuralFeature, value, context);
+			if (result.getSeverity() == Diagnostic.OK) {
+				continue;
+			}
+			diagnostics.add(result);
+		}
+
+	}
+
+	@Override
+	public void addConstraintValidator(ENamedElement element, IFeatureConstraint constraint) {
+
+		if (!constraints.containsKey(constraint)) {
+			constraints.put(element, new LinkedHashSet<IFeatureConstraint>());
+		}
+		constraints.get(element).add(constraint);
+
+	}
+
+	/**
+	 * Called by the framework when the component gets activated.
+	 *
+	 * @param bundleContext The {@link BundleContext}
+	 */
+	@Activate
+	protected void activate(BundleContext bundleContext) {
+		constraints = new LinkedHashMap<ENamedElement, Set<IFeatureConstraint>>();
+	}
+
+	/**
+	 * Called by the framework when the component gets deactivated.
+	 *
+	 * @param bundleContext The {@link BundleContext}
+	 */
+	@Deactivate
+	protected void deactivate(BundleContext bundleContext) {
+		constraints = null;
+	}
+
+	/**
+	 * An {@link EObjectValidator} that considers loose constraints of any annotation details entry.
+	 *
+	 */
+	class LooseEValidator extends EObjectValidator implements PreSetValidator {
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.emf.ecore.util.EObjectValidator#validatePattern(org.eclipse.emf.ecore.EDataType,
+		 *      java.lang.Object, org.eclipse.emf.ecore.EValidator.PatternMatcher[][],
+		 *      org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+		 */
+		@Override
+		protected boolean validatePattern(EDataType eDataType, Object value, PatternMatcher[][] patterns,
+			DiagnosticChain diagnostics, Map<Object, Object> context) {
+
+			final Optional<String> loosePattern = findLooseConstraint(eDataType, LOOSE_PATTERN_KEY);
+
+			if (loosePattern.isPresent()) {
+				return super.validatePattern(eDataType, value, new PatternMatcher[][] {
+					{
+						new PatternMatcher() {
+							@Override
+							public boolean matches(String value) {
+								final Pattern pattern = Pattern.compile(loosePattern.get());
+								final Matcher matcher = pattern.matcher(value);
+								return matcher.matches();
+							}
+						}
+					}
+				}, diagnostics, context);
+			}
+
+			return super.validatePattern(eDataType, value, patterns, diagnostics, context);
+		}
+	}
+
+	/**
+	 * An {@link DynamicEDataTypeValidator} that considers loose constraints of any annotation details entry.
+	 *
+	 */
+	class DynamicLoosePatternEValidator extends DynamicEDataTypeValidator implements PreSetValidator {
+
+		/**
+		 * Constructor.
+		 *
+		 * @param eObjectValidator an instance of an {@link EObjectValidator}
+		 * @param eDataType the {@link EDataType} to be validated
+		 */
+		DynamicLoosePatternEValidator(EObjectValidator eObjectValidator, EDataType eDataType) {
+			eObjectValidator.super(eDataType);
+		}
+
+		/**
+		 * {@inheritDoc}
+		 *
+		 * @see org.eclipse.emf.ecore.util.EObjectValidator.DynamicEDataTypeValidator#validateSchemaConstraints(org.eclipse.emf.ecore.EDataType,
+		 *      java.lang.Object, org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+		 */
+		@Override
+		protected boolean validateSchemaConstraints(EDataType eDataType, Object value, DiagnosticChain diagnostics,
+			Map<Object, Object> context) {
+
+			final Optional<String> looseMinLength = findLooseConstraint(eDataType, LOOSE_MIN_LENGTH);
+
+			if (looseMinLength.isPresent()) {
+				effectiveMinLength = Integer.parseInt(looseMinLength.get());
+				super.validateSchemaConstraints(eDataType, value, diagnostics, context);
+			}
+
+			return super.validateSchemaConstraints(eDataType, value, diagnostics, context);
+		}
+	}
+}
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/src/org/eclipse/emfforms/internal/common/prevalidation/PreSetValidator.java b/bundles/org.eclipse.emfforms.common.prevalidation/src/org/eclipse/emfforms/internal/common/prevalidation/PreSetValidator.java
new file mode 100644
index 0000000000..5e308eb516
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/src/org/eclipse/emfforms/internal/common/prevalidation/PreSetValidator.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.common.prevalidation;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.ecore.EDataType;
+
+/**
+ * Common interface for
+ * {@link org.eclipse.emf.ecp.view.internal.validation.PreSetValidationServiceImpl.LooseEValidatorLooseEValidator}
+ * and
+ * {@link org.eclipse.emfforms.spi.common.prevalidation.PreSetValidationServiceImpl.DynamicLoosePatternEValidator
+ * DynamicLoosePatternEValidator}.
+ *
+ */
+public interface PreSetValidator {
+
+	/**
+	 * Validates the object in the given context, optionally producing diagnostics.
+	 *
+	 * @param eDataType the {@link org.eclipse.emf.ecore.EDataType EDataType} to validate the value against
+	 * @param value the value to be validated
+	 * @param diagnostics a place to accumulate diagnostics; if it's <code>null</code>, no diagnostics should be
+	 *            produced.
+	 * @param context a place to cache information, if it's <code>null</code>, no cache is supported.
+	 * @return whether the object is valid.
+	 */
+	boolean validate(EDataType eDataType, Object value, DiagnosticChain diagnostics, Map<Object, Object> context);
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/.checkstyle b/bundles/org.eclipse.emfforms.common.validation/.checkstyle
new file mode 100644
index 0000000000..19c54776c3
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+  <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+    <file-match-pattern match-pattern=".java" include-pattern="true"/>
+  </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emfforms.common.validation/.classpath b/bundles/org.eclipse.emfforms.common.validation/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emfforms.common.validation/.gitignore b/bundles/org.eclipse.emfforms.common.validation/.gitignore
new file mode 100644
index 0000000000..ae3c172604
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/bundles/org.eclipse.emfforms.common.validation/.project b/bundles/org.eclipse.emfforms.common.validation/.project
new file mode 100644
index 0000000000..5bb678c259
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emfforms.common.validation</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+	</natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..f548abbf0b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..5a0ad22d2a
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..66c53c11ad
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,419 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000000..3bb235278e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000000..8bc4bb4b36
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000000..864e30fe5d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000000..cc2c0255cd
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,98 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000000..0bbee3c4b8
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..fbba026370
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Common Validation
+Bundle-SymbolicName: org.eclipse.emfforms.common.validation;singleton:=true
+Bundle-Version: 1.13.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.validation",
+ org.eclipse.emfforms.common.spi.validation;version="1.13.0",
+ org.eclipse.emfforms.common.spi.validation.exception;version="1.13.0",
+ org.eclipse.emfforms.common.spi.validation.filter;version="1.13.0"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.common.validation/about.html b/bundles/org.eclipse.emfforms.common.validation/about.html
new file mode 100644
index 0000000000..d35d5aed64
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.emfforms.common.validation/build.properties b/bundles/org.eclipse.emfforms.common.validation/build.properties
new file mode 100644
index 0000000000..ea0277b01f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/build.properties
@@ -0,0 +1,6 @@
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html
+source.. = src/
+src.includes = about.html
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.common.validation/pom.xml b/bundles/org.eclipse.emfforms.common.validation/pom.xml
new file mode 100644
index 0000000000..2c60848b6e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.emf.ecp</groupId>
+    <artifactId>ecp-bundles-parent</artifactId>
+    <version>1.13.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.emf.ecp</groupId>
+  <artifactId>org.eclipse.emfforms.common.validation</artifactId>
+  <version>1.13.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+</project>
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/Activator.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/Activator.java
new file mode 100644
index 0000000000..ae3d6d0920
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/Activator.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.internal.validation;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The bundle activator.
+ */
+public class Activator extends Plugin {
+
+	/**
+	 * The plug-in ID.
+	 */
+	public static final String PLUGIN_ID = "org.eclipse.emfforms.common.validation"; //$NON-NLS-1$
+
+	/**
+	 * The shared instance.
+	 */
+	private static Activator plugin;
+
+	/**
+	 * The constructor.
+	 */
+	public Activator() {
+	}
+
+	// BEGIN SUPRESS CATCH EXCEPTION
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+	}
+	// END SUPRESS CATCH EXCEPTION
+
+	/**
+	 * Returns the shared instance.
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Logs exception.
+	 *
+	 * @param e the {@link Exception} to log
+	 */
+	public static void logException(Exception e) {
+		getDefault().getLog().log(
+			new Status(IStatus.ERROR, Activator.getDefault().getBundle().getSymbolicName(), e.getMessage(), e));
+	}
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/DiagnosticHelper.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/DiagnosticHelper.java
new file mode 100644
index 0000000000..00e248070f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/DiagnosticHelper.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.internal.validation;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+
+/**
+ * Helper class for validation handling.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public final class DiagnosticHelper {
+
+	private DiagnosticHelper() {
+
+	}
+
+	/**
+	 * Returns the first {@link EStructuralFeature} in the given list.
+	 *
+	 * @param data the list to search for a {@link EStructuralFeature}
+	 * @return the found {@link EStructuralFeature}, null if no {@link EStructuralFeature} is found
+	 */
+	public static EStructuralFeature getEStructuralFeature(List<?> data) {
+		if (data == null || data.isEmpty()) {
+			return null;
+		}
+		// Exclude first object for cases when we validate an EStructuralFeature.
+		for (final Object object : data.subList(1, data.size())) {
+			if (EStructuralFeature.class.isInstance(object)) {
+				return EStructuralFeature.class.cast(object);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the first {@link InternalEObject} in the given list.
+	 *
+	 * @param data the list to search for a {@link InternalEObject}
+	 * @return the found {@link InternalEObject}, null if no {@link InternalEObject} is found
+	 */
+	public static InternalEObject getFirstInternalEObject(List<?> data) {
+		for (final Object object : data) {
+			if (InternalEObject.class.isInstance(object)) {
+				return InternalEObject.class.cast(object);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Verify if the given {@link Diagnostic} contains at least one {@link EStructuralFeature} or a
+	 * {@link InternalEObject}.
+	 *
+	 * @param diagnostic the {@link Diagnostic} to check
+	 * @return true if the {@link Diagnostic} contains at least one {@link EStructuralFeature} or
+	 *         {@link InternalEObject}, false otherwise
+	 */
+	public static boolean checkDiagnosticData(Diagnostic diagnostic) {
+		final List<?> data = diagnostic.getData();
+		if (data.size() < 2) {
+			return false;
+		}
+		if (getFirstInternalEObject(data) == null) {
+			return false;
+		}
+		if (getEStructuralFeature(data) == null) {
+			return false;
+		}
+		return true;
+	}
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/ValidationServiceImpl.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/ValidationServiceImpl.java
new file mode 100644
index 0000000000..d4675a782b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/internal/validation/ValidationServiceImpl.java
@@ -0,0 +1,324 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.internal.validation;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider;
+import org.eclipse.emf.ecore.util.Diagnostician;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.emfforms.common.spi.validation.ValidationResultListener;
+import org.eclipse.emfforms.common.spi.validation.ValidationService;
+import org.eclipse.emfforms.common.spi.validation.Validator;
+import org.eclipse.emfforms.common.spi.validation.exception.ValidationCanceledException;
+import org.eclipse.emfforms.common.spi.validation.filter.DiagnosticFilter;
+import org.eclipse.emfforms.common.spi.validation.filter.ObjectFilter;
+import org.eclipse.emfforms.common.spi.validation.filter.SubTreeFilter;
+import org.eclipse.emfforms.common.spi.validation.filter.ValidationFilter;
+
+/**
+ * The implementation of {@link ValidationService}.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public class ValidationServiceImpl implements ValidationService {
+
+	private final Set<Validator> validators = new LinkedHashSet<Validator>();
+
+	private final Set<ObjectFilter> objectFilter = new LinkedHashSet<ObjectFilter>();
+	private final Set<SubTreeFilter> subTreeFilters = new LinkedHashSet<SubTreeFilter>();
+	private final Set<DiagnosticFilter> diagnosticFilters = new LinkedHashSet<DiagnosticFilter>();
+
+	private final Set<ValidationResultListener> validationResultListeners = new LinkedHashSet<ValidationResultListener>();
+
+	private SubstitutionLabelProvider substitutionLabelProvider;
+
+	private boolean validationRunning;
+	private boolean cancelationRequested;
+
+	private Diagnostician diagnostician;
+
+	/**
+	 * Default constructor.
+	 */
+	public ValidationServiceImpl() {
+		diagnostician = new Diagnostician(EValidator.Registry.INSTANCE) {
+			@Override
+			public boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics,
+				Map<Object, Object> context) {
+				Object eValidator;
+				EClass eType = eClass;
+				while ((eValidator = eValidatorRegistry.get(eType.eContainer())) == null) {
+					final List<EClass> eSuperTypes = eType.getESuperTypes();
+					if (eSuperTypes.isEmpty()) {
+						eValidator = eValidatorRegistry.get(null);
+						break;
+					}
+					eType = eSuperTypes.get(0);
+				}
+				return doValidate((EValidator) eValidator, eClass, eObject, diagnostics, context);
+			}
+		};
+	}
+
+	private boolean isFiltered(EObject object) {
+		if (objectFilter.isEmpty()) {
+			return false;
+		}
+		for (final ObjectFilter filter : objectFilter) {
+			if (filter.skipValidation(object)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private boolean isSkipSubtree(EObject object, Optional<Diagnostic> diagnostic) {
+		if (subTreeFilters.isEmpty()) {
+			return false;
+		}
+		for (final SubTreeFilter filter : subTreeFilters) {
+			if (filter.skipSubtree(object, diagnostic)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private boolean isIgnored(EObject object, Diagnostic diagnostic) {
+		if (diagnosticFilters.isEmpty()) {
+			return false;
+		}
+		for (final DiagnosticFilter filter : diagnosticFilters) {
+			if (filter.ignoreDiagnostic(object, diagnostic)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private Diagnostic doValidate(EObject eObject) {
+
+		Diagnostic diagnostic = null;
+		try {
+
+			diagnostic = getDiagnosticForEObject(eObject);
+			return diagnostic;
+
+		} finally {
+			invokeValidationResultListeners(eObject, diagnostic, false);
+		}
+
+	}
+
+	@Override
+	public Diagnostic validate(EObject eObject) {
+		if (isFiltered(eObject)) {
+			return null;
+		}
+		return doValidate(eObject);
+	}
+
+	@Override
+	public Set<Diagnostic> validate(Iterator<EObject> eObjectsIterator) throws ValidationCanceledException {
+
+		final Set<Diagnostic> diagnostics = new LinkedHashSet<Diagnostic>();
+		if (validationRunning) {
+			return diagnostics; // prevent re-entry
+		}
+
+		validationRunning = true;
+		try {
+
+			final boolean isTreeIterator = eObjectsIterator instanceof TreeIterator<?>;
+			while (!cancelationRequested && eObjectsIterator.hasNext()) {
+
+				final EObject eObject = eObjectsIterator.next();
+				Diagnostic diagnostic = null;
+
+				boolean isSubtreePruned = false;
+				if (isTreeIterator && isSkipSubtree(eObject, Optional.ofNullable(diagnostic))) {
+					((TreeIterator<?>) eObjectsIterator).prune();
+					isSubtreePruned = true;
+				}
+				if (isFiltered(eObject)) {
+					continue;
+				}
+
+				diagnostic = doValidate(eObject);
+
+				if (isTreeIterator && !isSubtreePruned && isSkipSubtree(eObject, Optional.of(diagnostic))) {
+					((TreeIterator<?>) eObjectsIterator).prune();
+				}
+				if (isIgnored(eObject, diagnostic)) {
+					continue;
+				}
+
+				diagnostics.add(diagnostic);
+				invokeValidationResultListeners(eObject, diagnostic, true);
+
+			}
+		} finally {
+			validationRunning = false;
+		}
+
+		if (cancelationRequested) {
+			throw new ValidationCanceledException();
+		}
+		return diagnostics;
+	}
+
+	private void invokeValidationResultListeners(EObject eObject, Diagnostic diagnostic, boolean passed) {
+		if (validationResultListeners.isEmpty()) {
+			return;
+		}
+
+		for (final ValidationResultListener listener : validationResultListeners) {
+			if (passed) {
+				listener.afterValidate(eObject, diagnostic);
+			} else {
+				listener.onValidate(eObject, diagnostic);
+			}
+		}
+	}
+
+	/**
+	 * Returns a {@link EValidator} for the given {@link EObject}.
+	 *
+	 * @param eObject the {@link EObject} to retrieve a {@link EValidator} for
+	 * @return the {@link EValidator}
+	 */
+	protected EValidator getEValidatorForEObject(EObject eObject) {
+		if (EValidator.Registry.INSTANCE.getEValidator(eObject.eClass().getEPackage()) == null) {
+			return new EObjectValidator();
+		}
+		return diagnostician;
+	}
+
+	/**
+	 * Computes the {@link Diagnostic} for the given eObject.
+	 *
+	 * @param object the {@link EObject} to validate
+	 * @return the {@link Diagnostic}
+	 */
+	protected Diagnostic getDiagnosticForEObject(EObject object) {
+
+		final EValidator eValidator = getEValidatorForEObject(object);
+		final BasicDiagnostic diagnostic = Diagnostician.INSTANCE.createDefaultDiagnostic(object);
+		final Map<Object, Object> context = new LinkedHashMap<Object, Object>();
+		context.put(EValidator.class, eValidator);
+		if (substitutionLabelProvider != null) {
+			context.put(EValidator.SubstitutionLabelProvider.class, substitutionLabelProvider);
+		}
+
+		eValidator.validate(object, diagnostic, context);
+
+		final Map<EStructuralFeature, DiagnosticChain> diagnosticMap = new LinkedHashMap<EStructuralFeature, DiagnosticChain>();
+		for (final Diagnostic child : diagnostic.getChildren()) {
+			if (DiagnosticChain.class.isInstance(child) && DiagnosticHelper.checkDiagnosticData(child)) {
+				diagnosticMap.put(DiagnosticHelper.getEStructuralFeature(child.getData()),
+					(DiagnosticChain) child);
+			}
+		}
+
+		for (final Validator validator : validators) {
+			final List<Diagnostic> additionValidation = validator.validate(object);
+			if (additionValidation == null) {
+				continue;
+			}
+			for (final Diagnostic additionDiagnostic : additionValidation) {
+				if (diagnosticMap
+					.containsKey(DiagnosticHelper.getEStructuralFeature(additionDiagnostic.getData()))) {
+					diagnosticMap.get(DiagnosticHelper.getEStructuralFeature(additionDiagnostic.getData()))
+						.add(additionDiagnostic);
+				} else {
+					// only add non-OK diagnostics
+					if (additionDiagnostic.getSeverity() != Diagnostic.OK) {
+						diagnostic.add(additionDiagnostic);
+					}
+				}
+
+			}
+		}
+		return diagnostic;
+	}
+
+	@Override
+	public void addValidator(Validator validator) {
+		validators.add(validator);
+	}
+
+	@Override
+	public void removeValidator(Validator validator) {
+		validators.remove(validator);
+	}
+
+	@Override
+	public void registerValidationFilter(ValidationFilter filter) {
+		if (filter instanceof ObjectFilter) {
+			objectFilter.add((ObjectFilter) filter);
+		}
+		if (filter instanceof SubTreeFilter) {
+			subTreeFilters.add((SubTreeFilter) filter);
+		}
+		if (filter instanceof DiagnosticFilter) {
+			diagnosticFilters.add((DiagnosticFilter) filter);
+		}
+	}
+
+	@Override
+	public void unregisterValidationFilter(ValidationFilter filter) {
+		objectFilter.remove(filter);
+		subTreeFilters.remove(filter);
+		diagnosticFilters.remove(filter);
+	}
+
+	@Override
+	public void registerValidationResultListener(ValidationResultListener listener) {
+		validationResultListeners.add(listener);
+	}
+
+	@Override
+	public void unregisterValidationResultListener(ValidationResultListener listener) {
+		validationResultListeners.remove(listener);
+	}
+
+	@Override
+	public void setSubstitutionLabelProvider(SubstitutionLabelProvider substitutionLabelProvider) {
+		this.substitutionLabelProvider = substitutionLabelProvider;
+	}
+
+	@Override
+	public boolean isBusy() {
+		return validationRunning;
+	}
+
+	@Override
+	public void cancel() {
+		cancelationRequested = true;
+	}
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/ValidationResultListener.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/ValidationResultListener.java
new file mode 100644
index 0000000000..199ee21486
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/ValidationResultListener.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Diagnostic listener which can be used to subscribe to {@link Diagnostic} changes during model validation.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public interface ValidationResultListener {
+
+	/**
+	 * Callback which is invoked for every validation result.
+	 *
+	 * @param eObject the eObject which has been validated
+	 * @param diagnostic the {@link Diagnostic} result of the validation
+	 */
+	void onValidate(EObject eObject, Diagnostic diagnostic);
+
+	/**
+	 * Callback which is invoked for every validation result which passed filtering.
+	 * Validation result has been added to the validator output at this point.
+	 *
+	 * Note: this method is not triggered by {@link ValidationService#validate(EObject)}.
+	 *
+	 * @param eObject the eObject which has been validated
+	 * @param diagnostic the {@link Diagnostic} result of the validation
+	 */
+	void afterValidate(EObject eObject, Diagnostic diagnostic);
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/ValidationService.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/ValidationService.java
new file mode 100644
index 0000000000..b71e24a9be
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/ValidationService.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider;
+import org.eclipse.emfforms.common.spi.validation.exception.ValidationCanceledException;
+import org.eclipse.emfforms.common.spi.validation.filter.ValidationFilter;
+
+/**
+ * Generic EMF validation service which allows validation of a collection of {@link EObject}s
+ * honoring defined EValidators. Additionally custom {@link Validator}s can be registered
+ * i.e. if the feature set of the EValidators is insufficient.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public interface ValidationService {
+
+	/**
+	 * Adds a validation provider to the list of known validators.
+	 *
+	 * @param validator the {@link Validator} to add
+	 */
+	void addValidator(Validator validator);
+
+	/**
+	 * Removes a validation provider from the list of known validators.
+	 *
+	 * @param validator the {@link Validator} to remove
+	 */
+	void removeValidator(Validator validator);
+
+	/**
+	 * Registers a validation filter.
+	 *
+	 * @param <Filter> an {@link ValidationFilter} implementation
+	 * @param filter the {@link ValidationFilter} to register
+	 */
+	<Filter extends ValidationFilter> void registerValidationFilter(Filter filter);
+
+	/**
+	 * Unregisters a validation filter.
+	 *
+	 * @param <Filter> an {@link ValidationFilter} implementation
+	 * @param filter the {@link ValidationFilter} to unregister
+	 */
+	<Filter extends ValidationFilter> void unregisterValidationFilter(Filter filter);
+
+	/**
+	 * Registers a {@link ValidationResultListener}.
+	 *
+	 * @param listener the {@link ValidationResultListener} to register
+	 */
+	void registerValidationResultListener(ValidationResultListener listener);
+
+	/**
+	 * Unregisters a {@link ValidationResultListener}.
+	 *
+	 * @param listener the {@link ValidationResultListener} to unregister
+	 */
+	void unregisterValidationResultListener(ValidationResultListener listener);
+
+	/**
+	 * Set a {@link SubstitutionLabelProvider} to be used for substituting labels in {@link Diagnostic}s.
+	 *
+	 * @see org.eclipse.emf.ecore.EValidator.SubstitutionLabelProvider
+	 *
+	 * @param substitutionLabelProvider the {@link SubstitutionLabelProvider} to be set for this service
+	 */
+	void setSubstitutionLabelProvider(SubstitutionLabelProvider substitutionLabelProvider);
+
+	/**
+	 * Validates the given eObject.
+	 *
+	 * @param eObject the eObject to validate
+	 * @return the resulting {@link Diagnostic}, or null if the eObject is filtered by a {@link ValidationFilter}
+	 */
+	Diagnostic validate(EObject eObject);
+
+	/**
+	 * Uses the given iterator to validate all eObjects in a collection.
+	 *
+	 * @param eObjects the list to validate
+	 * @return the resulting set of {@link Diagnostic}s
+	 * @throws ValidationCanceledException in case {@link #cancel()} has been called
+	 */
+	Set<Diagnostic> validate(Iterator<EObject> eObjects) throws ValidationCanceledException;
+
+	/**
+	 * Returns true as long as a validation is in process.
+	 * Not applicable for single validation runs with {@link #validate(EObject)}.
+	 * See {@link #cancel()} to interrupt a running validation process.
+	 *
+	 * @return true as long as a validation is running, false otherwise.
+	 */
+	boolean isBusy();
+
+	/**
+	 * Allows to cancel the current validation run (if any).
+	 * Not applicable for single validation runs with {@link #validate(EObject)}.
+	 */
+	void cancel();
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/Validator.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/Validator.java
new file mode 100644
index 0000000000..78b0dd2b18
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/Validator.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Interface for custom validators to be registered on a {@link ValidationService}.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public interface Validator {
+
+	/**
+	 * Method is called by the {@link ValidationService} to retrieve addition validation
+	 * information for the given {@link EObject}.
+	 *
+	 * @param eObject the {@link EObject} to validate
+	 * @return the List of additional {@link Diagnostic Diagnostics} for the {@link EObject}
+	 */
+	// TODO possibly refactor interface to void validate(EObject eObject, List<Diagnostic>);
+	List<Diagnostic> validate(EObject eObject);
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/exception/ValidationCanceledException.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/exception/ValidationCanceledException.java
new file mode 100644
index 0000000000..07d5eafd26
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/exception/ValidationCanceledException.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.exception;
+
+/**
+ * Exception which is thrown by ValidationService#validate(java.util.Iterator) in case
+ * ValidationService#cancel() is invoked before the entire queue has been processed.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public class ValidationCanceledException extends Exception {
+
+	private static final long serialVersionUID = 938755283756812085L;
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/AbstractComplexFilter.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/AbstractComplexFilter.java
new file mode 100644
index 0000000000..d685d78022
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/AbstractComplexFilter.java
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.filter;
+
+/**
+ * Convenience class for custom filters. Helps to reduce clutter.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public abstract class AbstractComplexFilter extends AbstractSimpleFilter implements SubTreeFilter {
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/AbstractSimpleFilter.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/AbstractSimpleFilter.java
new file mode 100644
index 0000000000..c1425f4607
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/AbstractSimpleFilter.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.filter;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Convenience class for custom filters. Helps to reduce clutter.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public abstract class AbstractSimpleFilter implements ObjectFilter, DiagnosticFilter {
+
+	@Override
+	public boolean ignoreDiagnostic(EObject eObject, Diagnostic diagnostic) {
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/DiagnosticFilter.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/DiagnosticFilter.java
new file mode 100644
index 0000000000..99ea2059b7
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/DiagnosticFilter.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.filter;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Interface that allows filtering of {@link Diagnostic}s.
+ * See ValidationService#registerValidationFilter(ValidationFilter).
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public interface DiagnosticFilter extends ValidationFilter {
+
+	/**
+	 * Return true if the given {@link Diagnostic} should be ignored.
+	 * Ignored {@link Diagnostic}s will not appear in the output of ValidationService#validate(EObject).
+	 *
+	 * @param eObject the {@link EObject} that has been validated
+	 * @param diagnostic the {@link Diagnostic} as a result of the validation of the given {@link EObject}
+	 * @return true if the given {@link Diagnostic} should not be included in the output
+	 *         of ValidationService#validate(EObject)
+	 */
+	boolean ignoreDiagnostic(EObject eObject, Diagnostic diagnostic);
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/ObjectFilter.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/ObjectFilter.java
new file mode 100644
index 0000000000..e4905dbf57
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/ObjectFilter.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.filter;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Filter interface which allows to skip validation for certain {@link EObject}s
+ * or to ignore Diagnostics reported by EValidators and Validators.
+ * See ValidationService#registerValidationFilter(ValidationFilter).
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public interface ObjectFilter extends ValidationFilter {
+
+	/**
+	 * Return true if the given {@link EObject} should NOT be validated.
+	 *
+	 * @param eObject the {@link EObject} about to be validated
+	 * @return true if the given {@link EObject} should be skipped during validation.
+	 *         Note: if you use ValidationService#validate(java.util.Iterator) in conjunction with a
+	 *         TreeIterator all eContents of the given {@link EObject} will be skipped as well.
+	 */
+	boolean skipValidation(EObject eObject);
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/SeverityFilter.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/SeverityFilter.java
new file mode 100644
index 0000000000..73071f052d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/SeverityFilter.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.filter;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Convenience class to filter {@link Diagnostic}s based on their severity.
+ * See ValidationService#registerValidationFilter(ValidationFilter).
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public class SeverityFilter implements DiagnosticFilter {
+
+	private final int minimumSeverity;
+
+	/**
+	 * Constructor with default severity.
+	 *
+	 * @param minimumSeverity the minimum severity to pass, i.e. Diagnostic.WARNING
+	 */
+	public SeverityFilter(int minimumSeverity) {
+		this.minimumSeverity = minimumSeverity;
+	}
+
+	@Override
+	public boolean ignoreDiagnostic(EObject eObject, Diagnostic diagnostic) {
+		return diagnostic.getSeverity() < minimumSeverity;
+	}
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/SubTreeFilter.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/SubTreeFilter.java
new file mode 100644
index 0000000000..14f1c176a1
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/SubTreeFilter.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.filter;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emfforms.common.Optional;
+
+/**
+ * Interface that allows to skip the validation of sub trees. Only applicable for
+ * ValidationService#validate(java.util.Iterator) in conjunction with a EMF TreeIterator.
+ * See ValidationService#registerValidationFilter(ValidationFilter).
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public interface SubTreeFilter extends ValidationFilter {
+
+	/**
+	 * Return true if the eContents (subtree) of the given {@link EObject} should not be validated.
+	 *
+	 * Note: this is only applicable for ValidationService#validate(java.util.Iterator)
+	 * in conjunction with a EMF TreeIterator.
+	 *
+	 * @param eObject the parent {@link EObject}
+	 * @param diagnostic the {@link Diagnostic} for the {@link EObject} in case it has been validated.
+	 * @return true, if the subtree of the given {@link EObject} should be skipped.
+	 */
+	boolean skipSubtree(EObject eObject, Optional<Diagnostic> diagnostic);
+
+}
diff --git a/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/ValidationFilter.java b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/ValidationFilter.java
new file mode 100644
index 0000000000..615e408d5f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common.validation/src/org/eclipse/emfforms/common/spi/validation/filter/ValidationFilter.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.common.spi.validation.filter;
+
+/**
+ * Base interface for all validation filters.
+ *
+ * @noimplement This interface is not intended to be implemented by clients.
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ */
+public interface ValidationFilter {
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
index 35462b07a0..92ee5501c3 100644
--- a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Common
 Bundle-SymbolicName: org.eclipse.emfforms.common
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.common;version="1.12.0",
- org.eclipse.emfforms.internal.common.converter;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.common.report;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.common.converter;version="1.12.0",
- org.eclipse.emfforms.spi.common.locale;version="1.12.0",
- org.eclipse.emfforms.spi.common.report;version="1.12.0"
+Export-Package: org.eclipse.emfforms.common;version="1.13.0",
+ org.eclipse.emfforms.internal.common.converter;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.common.report;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common.converter;version="1.13.0",
+ org.eclipse.emfforms.spi.common.locale;version="1.13.0",
+ org.eclipse.emfforms.spi.common.report;version="1.13.0",
+ org.eclipse.emfforms.spi.common.validation;version="1.13.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.common/pom.xml b/bundles/org.eclipse.emfforms.common/pom.xml
index 5ab773796e..5615fd959b 100644
--- a/bundles/org.eclipse.emfforms.common/pom.xml
+++ b/bundles/org.eclipse.emfforms.common/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.common</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/common/Optional.java b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/common/Optional.java
index f8cca3e2ab..870a6755ad 100644
--- a/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/common/Optional.java
+++ b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/common/Optional.java
@@ -95,4 +95,18 @@ public final class Optional<T> {
 		}
 		return value;
 	}
+
+	/**
+	 * Returns the wrapped value, if present, otherwise {@code null}.
+	 *
+	 * @return the wrapped value, if present, otherwise {@code null}
+	 *
+	 * @since 1.13
+	 */
+	public Object orNull() {
+		if (isPresent()) {
+			return get();
+		}
+		return null;
+	}
 }
diff --git a/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/IFeatureConstraint.java b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/IFeatureConstraint.java
new file mode 100644
index 0000000000..790764f139
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/IFeatureConstraint.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.common.validation;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * Interface that checks whether a given value
+ * complies with constraints defined by a given feature.
+ *
+ * @since 1.13
+ */
+public interface IFeatureConstraint {
+
+	/**
+	 * Context map key to retrieve the the root EObject (may be null).
+	 */
+	String E_ROOT_OBJECT = "rootEObject"; //$NON-NLS-1$
+
+	/**
+	 * Validate a given value against constraints defined by the {@link org.eclipse.emf.ecore.EDataType EDataType}
+	 * of the {@link EStructuralFeature}.
+	 *
+	 * @param eStructuralFeature the feature that defines any constraints
+	 * @param value the value to be validated
+	 * @param context the validation context, may be <code>null</code>
+	 * @return a {@link Diagnostic} describing any potential errors
+	 */
+	Diagnostic validate(EStructuralFeature eStructuralFeature, Object value, Map<Object, Object> context);
+}
diff --git a/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/PreSetValidationService.java b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/PreSetValidationService.java
new file mode 100644
index 0000000000..9c28d24c6d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/PreSetValidationService.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.common.validation;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+/**
+ * Pre-set validation service that checks whether a given value
+ * complies with constraints defined by a given feature.
+ *
+ * @since 1.13
+ */
+public interface PreSetValidationService extends IFeatureConstraint {
+
+	/**
+	 * Validate a given value against constraints defined by the EDataType
+	 * of the {@link EStructuralFeature}.
+	 *
+	 * @param eStructuralFeature the feature that defines any constraints
+	 * @param value the value to be validated
+	 * @return a {@link Diagnostic} describing any potential errors
+	 */
+	Diagnostic validate(EStructuralFeature eStructuralFeature, Object value);
+
+	/**
+	 * Add a custom {@link IFeatureConstraint}.
+	 *
+	 * @param element {@link ENamedElement} to add a validation constraint for
+	 * @param constraint the behavioral validation constraint
+	 */
+	void addConstraintValidator(ENamedElement element, IFeatureConstraint constraint);
+
+	/**
+	 * Validate a given value against loose constraints defined by the EDataType of the
+	 * {@link EStructuralFeature}.
+	 *
+	 * @param eStructuralFeature the feature that defines any constraints
+	 * @param value the value to be validated
+	 * @return a {@link Diagnostic} describing any potential errors
+	 */
+	Diagnostic validateLoose(EStructuralFeature eStructuralFeature, Object value);
+}
diff --git a/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/PreSetValidationServiceRunnable.java b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/PreSetValidationServiceRunnable.java
new file mode 100644
index 0000000000..5a2255836d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.common/src/org/eclipse/emfforms/spi/common/validation/PreSetValidationServiceRunnable.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.common.validation;
+
+/**
+ * Function that receives the {@link PreSetValidationService} as an input parameter.
+ *
+ * @since 1.13
+ */
+public interface PreSetValidationServiceRunnable {
+
+	/**
+	 * Execute this function.
+	 *
+	 * @param service the {@link PreSetValidationService}
+	 */
+	void run(PreSetValidationService service);
+
+}
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
index d411888947..0f85085fd8 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Featurepath Databinding Services
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)"
 Service-Component: OSGI-INF/featurePathDomainModelReferenceConverterService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
index 7bc5af58f1..b6832be946 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
index 3792c6a116..7f03f9bb30 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Converter
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
 Service-Component: OSGI-INF/indexDomainModelReferenceConverter.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
index 18efe62643..a0be3609ae 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emfforms</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
index 15500b1de4..76fd837b3d 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Keyattribute DMR Converter
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/KeyAttributeDomainModelReferenceConverter.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
index 8f0afa18da..f23db7dbd9 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.databinding.keyattribute</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
index cae8d4669d..957bb0d044 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Converter
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
 Service-Component: OSGI-INF/mappingDomainModelReferenceConverter.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
index a28c68c8fe..679bf251de 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emfforms</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
index 647b34495b..a19b5473b6 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Domain Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.service.component.annotations;version="0.0.0"
 Service-Component: OSGI-INF/EMFFormsDomainExpanderDefaultHeuristic.xml,OSGI-INF/EMFFormsDomainExpanderImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
index 07fcba9458..c107db96d5 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.default</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java
index cc860006d8..d8b3f7b4a2 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java
@@ -84,14 +84,8 @@ public class EMFFormsDMRExpanderDefaultHeuristic implements EMFFormsDMRExpander
 			}
 			EObject child = (EObject) currentResolvedEObject.eGet(eReference);
 			if (child == null) {
-				if (!eReference.getEReferenceType().isAbstract() && !eReference.getEReferenceType().isInterface()) {
-					child = EcoreUtil.create(eReference.getEReferenceType());
-				} else if (currentLeftReferences.size() == 1
-					&& !featurePathDMR.getDomainModelEFeature().getEContainingClass().isAbstract()
-					&& !featurePathDMR.getDomainModelEFeature().getEContainingClass().isInterface()) {
-					child = EcoreUtil.create(featurePathDMR.getDomainModelEFeature().getEContainingClass());
-				}
-				currentResolvedEObject.eSet(eReference, child);
+				child = createMissingPathElementIfPossible(featurePathDMR, currentResolvedEObject,
+					currentLeftReferences, eReference, child);
 			}
 			if (child == null) {
 				break;
@@ -102,6 +96,29 @@ public class EMFFormsDMRExpanderDefaultHeuristic implements EMFFormsDMRExpander
 	}
 
 	/**
+	 * @return the newly created object. may be <code>null</code> if creation was not possible
+	 */
+	private EObject createMissingPathElementIfPossible(final VFeaturePathDomainModelReference featurePathDMR,
+		EObject currentResolvedEObject, final ArrayList<EReference> currentLeftReferences, final EReference eReference,
+		EObject child) {
+		if (!eReference.getEReferenceType().isAbstract() && !eReference.getEReferenceType().isInterface()) {
+			child = EcoreUtil.create(eReference.getEReferenceType());
+		} else if (currentLeftReferences.size() == 1
+			&& !featurePathDMR.getDomainModelEFeature().getEContainingClass().isAbstract()
+			&& !featurePathDMR.getDomainModelEFeature().getEContainingClass().isInterface()) {
+			child = EcoreUtil.create(featurePathDMR.getDomainModelEFeature().getEContainingClass());
+		}
+		if (child != null) {
+			/*
+			 * only set the reference if we could create a child. otherwise we could end up in a infinite loop,
+			 * because a null-to-null set produces a non-touch notification. This might trigger resolve again.
+			 */
+			currentResolvedEObject.eSet(eReference, child);
+		}
+		return child;
+	}
+
+	/**
 	 * {@inheritDoc}
 	 *
 	 * @see org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDMRExpander#isApplicable(org.eclipse.emf.ecp.view.spi.model.VDomainModelReference)
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
index 9ae912ebb3..32bc42094c 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
index 6721045fd1..6b7549e459 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.index</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
index 7c5312feab..17acd55865 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
index a073c3db01..76bb345bca 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.keyattribute</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
index d0826add6c..857da3ae3f 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
index 06ef59d771..abfc551a5b 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.mapping</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
index 066ece8f30..1013894311 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms TableControl Domain Expander
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.table
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
index d56f37ca5d..1dda8005f7 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.domainexpander.table</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
index aac4761977..fc93e7fb9a 100644
--- a/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Edit Support
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.editsupport
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.editsupport;version="1.12.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.editsupport;version="1.13.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.13.0,1.14.0)"
 Service-Component: OSGI-INF/emfFormsEditSupport.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml b/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
index b572a045c4..d7ce471302 100644
--- a/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emfforms</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
index 2aa9b4a33f..d5ca62c632 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services EMF
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -17,13 +17,13 @@ Import-Package: org.eclipse.core.databinding.observable;version="0.0.0",
  org.eclipse.core.databinding.observable.value;version="0.0.0",
  org.eclipse.core.runtime;version="0.0.0",
  org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.6.0,2.0.0)"
 Service-Component: OSGI-INF/emfLabelProvider.xml, OSGI-INF/emfLabelProviderDefault.xml, OSGI-INF/databindingService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/pom.xml b/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
index 96d66863b2..f31983f1c6 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.emf</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
index 1802739756..e76f0a1b31 100644
--- a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms EMF Specific Service
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.emfspecificservice
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.12.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.13.0"
 Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/emfSpecificService.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
index 9c39faf780..bd10423d23 100644
--- a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
index bb311eda8f..36b927852a 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Legacy
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.spi.model;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
index a4c8d998ac..bf6563172f 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
index 6965a1b985..9364c0b5dc 100644
--- a/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Default Locale Provider
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.locale.default
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.12.0"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.13.0"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.13.0,1.14.0)"
 Service-Component: OSGI-INF/defaultLocalizationService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
index 53c5698646..1699014faf 100644
--- a/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.locale.default</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
index 7de2991d96..3ffa0378cb 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Mapping Provider Default Heuristic
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.default
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.defaultheuristic;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="0.0.0"
 Service-Component: OSGI-INF/EMFFormsMappingProviderDefaultHeuristic.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
index dc90d84fe2..39e20b2674 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.mappingprovider.default</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
index 32d07f401c..a77167c1ae 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Mapping Provider Table Control
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/EMFFormsMappingProviderTable.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
index 9a338c6f48..4ea40d2388 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.mappingprovider.table</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
index a57d5aaa9f..ae28d37c35 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Structural Change Tester Default Heuristic
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.default
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.defaultheuristic;version="1.7.0";x-friends:="org.eclipse.emfforms.core.services.structuralchange.table"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.service.component.annotations;version="0.0.0"
 Service-Component: OSGI-INF/StructuralChangeTesterDefault.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
index db92accd87..b19824dcdc 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.default</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
index 5f6d52bb2b..93441ecc58 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms StructuralChange Index
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.index
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.index.StructuralChangeTesterIndex.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
index 88b19d54b2..c16580df7b 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.index</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
index aeb9c4c92f..6ecdc14018 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute Structural Change Tester
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/StructuralChangeTesterKeyAttribute.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
index 5b04c4ba1c..8eae6c5d6f 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.keyattribute</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
index 0e9056f934..7e14a6d137 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms StructuralChange Mapping
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.mapping
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.mapping.StructuralChangeTesterMapping.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
index 1e283c9145..4f7c6eea20 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.mapping</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
index ae587720eb..423d6c6802 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Structural Change Tester Table
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.table
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.table;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
index b8c1164175..c717d7e9e8 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange.table</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
index 464ce52e31..fa676ba686 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Structural Change Tester
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.service.component.annotations;version="0.0.0"
 Service-Component: OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
index 65c12bdfbd..96a98ab7e4 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services.structuralchange</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
index 18ac1e5bc9..4978fd64a6 100644
--- a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services
 Bundle-SymbolicName: org.eclipse.emfforms.core.services
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.controlmapper;version="1.12.0",
- org.eclipse.emfforms.spi.core.services.databinding;version="1.12.0",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="1.12.0",
- org.eclipse.emfforms.spi.core.services.label;version="1.12.0",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.12.0",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="1.12.0",
- org.eclipse.emfforms.spi.core.services.view;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="1.13.0",
+ org.eclipse.emfforms.spi.core.services.databinding;version="1.13.0",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="1.13.0",
+ org.eclipse.emfforms.spi.core.services.label;version="1.13.0",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.13.0",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="1.13.0",
+ org.eclipse.emfforms.spi.core.services.view;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.databinding.observable.list;version="0.0.0",
  org.eclipse.core.databinding.observable.value;version="0.0.0",
  org.eclipse.core.databinding.property.list;version="0.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emf.ecp.view.spi.model;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="1.8.0",
  org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.controlmapper.SettingToControlMapFactoryImpl.xml,OSGI-INF/org.eclipse.emfforms.internal.core.services.mappingprovider.EMFFormsMappingProviderManagerImpl.xml,OSGI-INF/org.eclipse.emfforms.internal.core.services.scoped.EMFFormsViewServiceManagerImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services/pom.xml b/bundles/org.eclipse.emfforms.core.services/pom.xml
index 26672d73ea..4748c148c8 100644
--- a/bundles/org.eclipse.emfforms.core.services/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services/pom.xml
@@ -7,13 +7,13 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.core.services</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
index 6835f84a09..6eb915f145 100644
--- a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
@@ -160,7 +160,7 @@ public class SettingToControlMapperImpl implements EMFFormsSettingToControlMappe
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void updateControlMapping(VControl vControl) {
+	public synchronized void updateControlMapping(VControl vControl) {
 		if (vControl == null) {
 			return;
 		}
diff --git a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/ViewModelListener.java b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/ViewModelListener.java
index 5ece60b52a..31704c099c 100644
--- a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/ViewModelListener.java
+++ b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/ViewModelListener.java
@@ -15,6 +15,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.ecore.EObject;
@@ -89,6 +90,9 @@ public class ViewModelListener implements ModelChangeListener {
 	 */
 	@Override
 	public void notifyChange(ModelChangeNotification notification) {
+		if (notification.getRawNotification().getEventType() == Notification.REMOVING_ADAPTER) {
+			return;
+		}
 		for (final VControl control : vControls) {
 			// TODO: table detail views might have a different root.
 
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
index a1b5184678..ea4e60433d 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
@@ -2,44 +2,44 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ecore Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.actions;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.controls;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.actions;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,1.4.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.editor.ecore;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.editor.ecore;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)";resolution:=optional,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.13.0,1.14.0)";resolution:=optional,
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,OSGI-INF/dataTypeControlService.xml,OSGI-INF/eenumLiteralControlService.xml,OSGI-INF/org.eclipse.emfforms.internal.editor.ecore.controls.LinkOnlyMultiReferenceRendererService.xml,OSGI-INF/typedElementBoundsControlService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
index b1b424907d..e3c16817ff 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.ecore</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java
index 14d4a45d48..81dbc34a49 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/TypedElementBoundsRenderer.java
@@ -200,7 +200,7 @@ public class TypedElementBoundsRenderer extends AbstractControlSWTRenderer<VCont
 	}
 
 	private String getLocalizedString(String string) {
-		return LocalizationServiceHelper.getString(getClass(), string);
+		return LocalizationServiceHelper.getString(TypedElementBoundsRenderer.class, string);
 	}
 
 	private void createDataBindings(final Spinner lowerBound, final Spinner upperBound, Button unbounded) {
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
index 820bf72467..aee0b3036a 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Genmodel Editor Utilities
 Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel.util;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
index a5f04fb109..5c09dd5224 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/.checkstyle b/bundles/org.eclipse.emfforms.editor.genmodel/.checkstyle
index b7351b9035..19c54776c3 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/.checkstyle
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/.checkstyle
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
-  <local-check-config name="ECP Checkstyle" location="http://download.eclipse.org/ecp/config/esmCheckstyle.xml" type="remote" description="">
-    <additional-data name="cache-props-file-location" value="ECP Checkstyle_1424949086653_cache.properties"/>
-    <additional-data name="cache-file" value="true"/>
-    <additional-data name="cache-file-location" value="ECP Checkstyle_1424949086653_cache.xml"/>
+  <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
-  <fileset name="ECP Checkstyle" enabled="true" check-config-name="ECP Checkstyle" local="true">
-    <file-match-pattern match-pattern=".java$" include-pattern="true"/>
+  <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+    <file-match-pattern match-pattern=".java" include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.core.prefs
index 82d0031d52..984712d4a2 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.core.prefs
@@ -1,419 +1,408 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+eclipse.preferences.version=1

+org.eclipse.jdt.core.builder.cleanOutputFolder=clean

+org.eclipse.jdt.core.builder.duplicateResourceTask=warning

+org.eclipse.jdt.core.builder.invalidClasspath=abort

+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore

+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=

+org.eclipse.jdt.core.circularClasspath=error

+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error

+org.eclipse.jdt.core.codeComplete.argumentPrefixes=

+org.eclipse.jdt.core.codeComplete.argumentSuffixes=

+org.eclipse.jdt.core.codeComplete.fieldPrefixes=

+org.eclipse.jdt.core.codeComplete.fieldSuffixes=

+org.eclipse.jdt.core.codeComplete.localPrefixes=

+org.eclipse.jdt.core.codeComplete.localSuffixes=

+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=

+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=

+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=

+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=

+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled

+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore

+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull

+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault

+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable

+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled

+org.eclipse.jdt.core.compiler.doc.comment.support=enabled

+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

+org.eclipse.jdt.core.compiler.problem.deadCode=warning

+org.eclipse.jdt.core.compiler.problem.deprecation=warning

+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled

+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore

+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning

+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled

+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore

+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning

+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled

+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled

+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled

+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public

+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore

+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning

+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled

+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning

+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag

+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled

+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning

+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning

+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning

+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error

+org.eclipse.jdt.core.compiler.problem.nullReference=warning

+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error

+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning

+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning

+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore

+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore

+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning

+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning

+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore

+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore

+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled

+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled

+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning

+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

+org.eclipse.jdt.core.compiler.problem.unusedImport=warning

+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore

+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled

+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL

+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO

+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_assignment=0

+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0

+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16

+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_after_package=1

+org.eclipse.jdt.core.formatter.blank_lines_before_field=0

+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

+org.eclipse.jdt.core.formatter.blank_lines_before_method=1

+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

+org.eclipse.jdt.core.formatter.blank_lines_before_package=0

+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true

+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

+org.eclipse.jdt.core.formatter.comment.format_block_comments=true

+org.eclipse.jdt.core.formatter.comment.format_header=true

+org.eclipse.jdt.core.formatter.comment.format_html=true

+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true

+org.eclipse.jdt.core.formatter.comment.format_line_comments=true

+org.eclipse.jdt.core.formatter.comment.format_source_code=true

+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert

+org.eclipse.jdt.core.formatter.comment.line_length=120

+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true

+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true

+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false

+org.eclipse.jdt.core.formatter.compact_else_if=true

+org.eclipse.jdt.core.formatter.continuation_indentation=1

+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1

+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off

+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on

+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_empty_lines=false

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false

+org.eclipse.jdt.core.formatter.indentation.size=4

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert

+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert

+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert

+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

+org.eclipse.jdt.core.formatter.join_lines_in_comments=false

+org.eclipse.jdt.core.formatter.join_wrapped_lines=false

+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

+org.eclipse.jdt.core.formatter.lineSplit=120

+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

+org.eclipse.jdt.core.formatter.tabulation.char=tab

+org.eclipse.jdt.core.formatter.tabulation.size=4

+org.eclipse.jdt.core.formatter.use_on_off_tags=true

+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true

+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

+org.eclipse.jdt.core.incompatibleJDKLevel=ignore

+org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.ui.prefs
index 7d2a1b19b7..8553926909 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.jdt.ui.prefs
@@ -1,121 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_functional_interfaces=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.insert_inferred_type_arguments=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_redundant_type_arguments=false
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_lambda=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-sp_cleanup.use_type_arguments=false
+cleanup.add_default_serial_version_id=true

+cleanup.add_generated_serial_version_id=false

+cleanup.add_missing_annotations=true

+cleanup.add_missing_deprecated_annotations=true

+cleanup.add_missing_methods=false

+cleanup.add_missing_nls_tags=false

+cleanup.add_missing_override_annotations=true

+cleanup.add_missing_override_annotations_interface_methods=true

+cleanup.add_serial_version_id=false

+cleanup.always_use_blocks=true

+cleanup.always_use_parentheses_in_expressions=false

+cleanup.always_use_this_for_non_static_field_access=false

+cleanup.always_use_this_for_non_static_method_access=false

+cleanup.convert_functional_interfaces=false

+cleanup.convert_to_enhanced_for_loop=false

+cleanup.correct_indentation=false

+cleanup.format_source_code=true

+cleanup.format_source_code_changes_only=false

+cleanup.insert_inferred_type_arguments=false

+cleanup.make_local_variable_final=true

+cleanup.make_parameters_final=false

+cleanup.make_private_fields_final=true

+cleanup.make_type_abstract_if_missing_method=false

+cleanup.make_variable_declarations_final=true

+cleanup.never_use_blocks=false

+cleanup.never_use_parentheses_in_expressions=true

+cleanup.organize_imports=true

+cleanup.qualify_static_field_accesses_with_declaring_class=false

+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

+cleanup.qualify_static_member_accesses_with_declaring_class=true

+cleanup.qualify_static_method_accesses_with_declaring_class=false

+cleanup.remove_private_constructors=true

+cleanup.remove_redundant_type_arguments=true

+cleanup.remove_trailing_whitespaces=true

+cleanup.remove_trailing_whitespaces_all=true

+cleanup.remove_trailing_whitespaces_ignore_empty=false

+cleanup.remove_unnecessary_casts=false

+cleanup.remove_unnecessary_nls_tags=false

+cleanup.remove_unused_imports=true

+cleanup.remove_unused_local_variables=false

+cleanup.remove_unused_private_fields=true

+cleanup.remove_unused_private_members=false

+cleanup.remove_unused_private_methods=true

+cleanup.remove_unused_private_types=true

+cleanup.sort_members=false

+cleanup.sort_members_all=false

+cleanup.use_anonymous_class_creation=false

+cleanup.use_blocks=true

+cleanup.use_blocks_only_for_return_and_throw=false

+cleanup.use_lambda=true

+cleanup.use_parentheses_in_expressions=true

+cleanup.use_this_for_non_static_field_access=true

+cleanup.use_this_for_non_static_field_access_only_if_necessary=true

+cleanup.use_this_for_non_static_method_access=true

+cleanup.use_this_for_non_static_method_access_only_if_necessary=true

+cleanup.use_type_arguments=false

+cleanup_profile=_esmCleanUp

+cleanup_settings_version=2

+eclipse.preferences.version=1

+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true

+formatter_profile=_esmFormatter

+formatter_settings_version=12

+org.eclipse.jdt.ui.exception.name=ex

+org.eclipse.jdt.ui.gettersetter.use.is=true

+org.eclipse.jdt.ui.javadoc=true

+org.eclipse.jdt.ui.keywordthis=false

+org.eclipse.jdt.ui.overrideannotation=true

+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n            //\r\n            // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

+sp_cleanup.add_default_serial_version_id=true

+sp_cleanup.add_generated_serial_version_id=false

+sp_cleanup.add_missing_annotations=true

+sp_cleanup.add_missing_deprecated_annotations=true

+sp_cleanup.add_missing_methods=false

+sp_cleanup.add_missing_nls_tags=false

+sp_cleanup.add_missing_override_annotations=true

+sp_cleanup.add_missing_override_annotations_interface_methods=true

+sp_cleanup.add_serial_version_id=false

+sp_cleanup.always_use_blocks=true

+sp_cleanup.always_use_parentheses_in_expressions=false

+sp_cleanup.always_use_this_for_non_static_field_access=false

+sp_cleanup.always_use_this_for_non_static_method_access=false

+sp_cleanup.convert_functional_interfaces=false

+sp_cleanup.convert_to_enhanced_for_loop=false

+sp_cleanup.correct_indentation=false

+sp_cleanup.format_source_code=true

+sp_cleanup.format_source_code_changes_only=false

+sp_cleanup.insert_inferred_type_arguments=false

+sp_cleanup.make_local_variable_final=true

+sp_cleanup.make_parameters_final=false

+sp_cleanup.make_private_fields_final=true

+sp_cleanup.make_type_abstract_if_missing_method=false

+sp_cleanup.make_variable_declarations_final=true

+sp_cleanup.never_use_blocks=false

+sp_cleanup.never_use_parentheses_in_expressions=true

+sp_cleanup.on_save_use_additional_actions=true

+sp_cleanup.organize_imports=true

+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false

+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true

+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true

+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true

+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false

+sp_cleanup.remove_private_constructors=true

+sp_cleanup.remove_redundant_type_arguments=false

+sp_cleanup.remove_trailing_whitespaces=true

+sp_cleanup.remove_trailing_whitespaces_all=true

+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false

+sp_cleanup.remove_unnecessary_casts=false

+sp_cleanup.remove_unnecessary_nls_tags=true

+sp_cleanup.remove_unused_imports=true

+sp_cleanup.remove_unused_local_variables=false

+sp_cleanup.remove_unused_private_fields=true

+sp_cleanup.remove_unused_private_members=false

+sp_cleanup.remove_unused_private_methods=true

+sp_cleanup.remove_unused_private_types=true

+sp_cleanup.sort_members=false

+sp_cleanup.sort_members_all=false

+sp_cleanup.use_anonymous_class_creation=false

+sp_cleanup.use_blocks=true

+sp_cleanup.use_blocks_only_for_return_and_throw=false

+sp_cleanup.use_lambda=false

+sp_cleanup.use_parentheses_in_expressions=true

+sp_cleanup.use_this_for_non_static_field_access=true

+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true

+sp_cleanup.use_this_for_non_static_method_access=true

+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true

+sp_cleanup.use_type_arguments=false

diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000000..960a807c0b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
index 744f522986..6f36353fe6 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GenModel Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emfforms.internal.editor.genmodel.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.12.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
- org.eclipse.emfforms.internal.editor.genmodel.service;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.13.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
+ org.eclipse.emfforms.internal.editor.genmodel.service;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.runtime;version="3.4.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/plugin.xml b/bundles/org.eclipse.emfforms.editor.genmodel/plugin.xml
index f2162a0d68..debcfa2b02 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/plugin.xml
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/plugin.xml
@@ -45,5 +45,11 @@
             toolbarAction="org.eclipse.emfforms.internal.editor.genmodel.toolbaractions.GenerateJavaCodeAction">
       </action>
    </extension>
+   <extension
+         point="org.eclipse.emfforms.editor.toolbarActions">
+      <action
+            toolbarAction="org.eclipse.emfforms.internal.editor.genmodel.toolbaractions.GenerateEcoreEditorJavaCodeAction">
+      </action>
+   </extension>
 
 </plugin>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
index 086703ac6a..7d4ae6d082 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.genmodel</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java
index 1b7aa800e6..e719d16c14 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java
@@ -34,7 +34,7 @@ public class GenModelEditor extends GenericEditor {
 
 	@Override
 	public String getEditorTitle() {
-		return "Genmodel Editor";
+		return Messages.GenModelEditor_editorTitle;
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/Messages.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/Messages.java
new file mode 100644
index 0000000000..67c54ac786
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/Messages.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.genmodel;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Alexandra Buzila
+ * @generated
+ */
+public class Messages extends NLS {
+	private static final String BUNDLE_NAME = "org.eclipse.emfforms.internal.editor.genmodel.messages"; //$NON-NLS-1$
+	public static String GenerateEcoreEditorJavaCodeAction_noGenModelDialogTitle;
+	public static String GenerateEcoreEditorJavaCodeAction_noGenModelDialogMessage;
+	public static String GenerateJavaCodeAction_generateAll;
+	public static String GenerateJavaCodeAction_generateEdit;
+	public static String GenerateJavaCodeAction_generateEditor;
+	public static String GenerateJavaCodeAction_generateModel;
+	public static String GenerateJavaCodeAction_generateModelEdit;
+	public static String GenerateJavaCodeAction_generateTests;
+	public static String GenerateJavaCodeAction_generatingCodeTask;
+	public static String GenModelEditor_editorTitle;
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+	}
+
+	private Messages() {
+	}
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/messages.properties b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/messages.properties
new file mode 100644
index 0000000000..181c3e70ad
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/messages.properties
@@ -0,0 +1,10 @@
+GenerateEcoreEditorJavaCodeAction_noGenModelDialogTitle=No GenModel file found
+GenerateEcoreEditorJavaCodeAction_noGenModelDialogMessage=No GenModel file referencing the current EPackage was found next to your Ecore file.
+GenerateJavaCodeAction_generateAll=Generate All
+GenerateJavaCodeAction_generateEdit=Generate Edit
+GenerateJavaCodeAction_generateEditor=Generate Editor
+GenerateJavaCodeAction_generateModel=Generate Model
+GenerateJavaCodeAction_generateModelEdit=Generate Model + Edit
+GenerateJavaCodeAction_generateTests=Generate Tests
+GenerateJavaCodeAction_generatingCodeTask=Generating Code
+GenModelEditor_editorTitle=Genmodel Editor
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelGroupExpansionViewModelService.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelGroupExpansionViewModelService.java
index 96af7a2c5e..7e2e43ed03 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelGroupExpansionViewModelService.java
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelGroupExpansionViewModelService.java
@@ -26,7 +26,8 @@ import org.eclipse.emf.ecp.view.spi.model.VView;
 
 /**
  * This {@link ViewModelService} tracks the collapsed state of the groups used in {@link ViewModelContext#getViewModel()
- * view model} of the {@link org.eclipse.emfforms.internal.editor.genmodel.GenModelEditor GenModelEditor}. The group state is stored statically so it is the same across all input
+ * view model} of the {@link org.eclipse.emfforms.internal.editor.genmodel.GenModelEditor GenModelEditor}. The group
+ * state is stored statically so it is the same across all input
  * models.
  *
  * @author Martin Fleck
@@ -35,19 +36,19 @@ import org.eclipse.emf.ecp.view.spi.model.VView;
 public class GenModelGroupExpansionViewModelService implements ViewModelService {
 
 	// known group names of the Ecore visible through the GenModel editor
-	private static final String ECORE_STANDARD = "Standard";
-	private static final String ECORE_ADVANCED = "Advanced";
+	private static final String ECORE_STANDARD = "Standard"; //$NON-NLS-1$
+	private static final String ECORE_ADVANCED = "Advanced"; //$NON-NLS-1$
 
 	// known group names of the GenModel visible through the GenModel editor
-	private static final String GENMODEL_ALL = "All";
-	private static final String GENMODEL_EDIT = "Edit";
-	private static final String GENMODEL_EDITOR = "Editor";
-	private static final String GENMODEL_MODEL = "Model";
-	private static final String GENMODEL_MODEL_CLASS_DEFAULTS = "Model Class Defaults";
-	private static final String GENMODEL_MODEL_FEATURE_DEFAULTS = "Model Feature Defaults";
-	private static final String GENMODEL_PACKAGE_SUFFIXES = "Package Suffixes";
-	private static final String GENMODEL_TEMPLATES_MERGE = "Templates & Merge";
-	private static final String GENMODEL_TESTS = "Tests";
+	private static final String GENMODEL_ALL = "All"; //$NON-NLS-1$
+	private static final String GENMODEL_EDIT = "Edit"; //$NON-NLS-1$
+	private static final String GENMODEL_EDITOR = "Editor"; //$NON-NLS-1$
+	private static final String GENMODEL_MODEL = "Model"; //$NON-NLS-1$
+	private static final String GENMODEL_MODEL_CLASS_DEFAULTS = "Model Class Defaults"; //$NON-NLS-1$
+	private static final String GENMODEL_MODEL_FEATURE_DEFAULTS = "Model Feature Defaults"; //$NON-NLS-1$
+	private static final String GENMODEL_PACKAGE_SUFFIXES = "Package Suffixes"; //$NON-NLS-1$
+	private static final String GENMODEL_TEMPLATES_MERGE = "Templates & Merge"; //$NON-NLS-1$
+	private static final String GENMODEL_TESTS = "Tests"; //$NON-NLS-1$
 
 	/**
 	 * Map storing the collapsed group states by group name.
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/toolbaractions/GenerateEcoreEditorJavaCodeAction.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/toolbaractions/GenerateEcoreEditorJavaCodeAction.java
new file mode 100644
index 0000000000..d890173638
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/toolbaractions/GenerateEcoreEditorJavaCodeAction.java
@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emfforms.internal.editor.genmodel.Messages;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * The ToolbarAction allowing the User to generate Java code from the EcoreEditor.
+ *
+ * @author Alexandra Buzila
+ *
+ */
+public class GenerateEcoreEditorJavaCodeAction extends GenerateJavaCodeAction {
+
+	@Override
+	public boolean canExecute(Object object) {
+		if (!ResourceSet.class.isInstance(object)) {
+			return false;
+		}
+		// We can execute our Action only if the ResourceSet contains an EPackage
+		return getEPackage((ResourceSet) object) != null;
+	}
+
+	@Override
+	public Action getAction(Object currentObject, ISelectionProvider selectionProvider) {
+		final ResourceSet resourceSet = (ResourceSet) currentObject;
+		final GenModel genModel = getGenModel(resourceSet);
+		return new CreateEcoreJavaCodeAction(genModel, selectionProvider);
+	}
+
+	@Override
+	protected GenModel getGenModel(ResourceSet resourceSet) {
+		final EPackage ePackage = getEPackage(resourceSet);
+		if (ePackage == null) {
+			return null;
+		}
+		final URI resourceURI = ePackage.eResource().getURI();
+		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+		final IPath path = new Path(resourceURI.toFileString());
+		final IFile file = root.getFileForLocation(path);
+		final IContainer parent = file.getParent();
+		return getGenModelFile(parent, resourceSet, ePackage);
+	}
+
+	private GenModel getGenModelFile(IContainer parent, ResourceSet resourceSet, EPackage ePackage) {
+		for (final IResource resource : getGenModelFiles(parent)) {
+			final Resource emfResource = resourceSet
+				.getResource(URI.createPlatformResourceURI(resource.getFullPath().toString(), true), true);
+			if (emfResource.getContents().isEmpty() || !GenModel.class.isInstance(emfResource.getContents().get(0))) {
+				continue;
+			}
+			final GenModel genModel = (GenModel) emfResource.getContents().get(0);
+			for (final GenPackage genPackage : genModel.getGenPackages()) {
+				if (ePackage.getNsURI() != null && genPackage.getEcorePackage() != null
+					&& ePackage.getNsURI().equals(genPackage.getEcorePackage().getNsURI())) {
+					return genModel;
+				}
+			}
+		}
+		return null;
+	}
+
+	private List<IResource> getGenModelFiles(IContainer parent) {
+		final List<IResource> genModelFiles = new ArrayList<IResource>();
+		parent.exists();
+		try {
+			for (final IResource member : parent.members()) {
+				if (member.getFileExtension().equals("genmodel")) { //$NON-NLS-1$
+					genModelFiles.add(member);
+				}
+			}
+		} catch (final CoreException ex) {
+			// ignore
+		}
+		return genModelFiles;
+	}
+
+	/**
+	 * Returns the first {@link EPackage} object found in the first resource of the given {@link ResourceSet}.
+	 *
+	 * @param resourceSet the {@link ResourceSet} to check
+	 * @return the {@link EPackage} or <code>null</code> if none was found
+	 */
+	protected EPackage getEPackage(ResourceSet resourceSet) {
+		if (resourceSet.getResources().isEmpty()) {
+			return null;
+		}
+		final Resource topResource = resourceSet.getResources().get(0);
+		if (!topResource.getContents().isEmpty() && EPackage.class.isInstance(topResource.getContents().get(0))) {
+			return (EPackage) topResource.getContents().get(0);
+		}
+		return null;
+	}
+
+	/**
+	 * ToolbarAction to generate Java Code from the EcoreEditor.
+	 */
+	class CreateEcoreJavaCodeAction extends CreateJavaCodeAction {
+
+		/**
+		 * Constructor.
+		 *
+		 * @param genModel the {@link GenModel}
+		 * @param selectionProvider the {@link ISelectionProvider}
+		 */
+		CreateEcoreJavaCodeAction(GenModel genModel, ISelectionProvider selectionProvider) {
+			super(genModel, selectionProvider);
+		}
+
+		/**
+		 * Constructor.
+		 *
+		 * @param text the string used as the text for the action, or null if there is no text
+		 * @param types the project types
+		 * @param genModel the {@link GenModel}
+		 * @param selectionProvider the {@link ISelectionProvider}
+		 */
+		CreateEcoreJavaCodeAction(String text, Object[] types, GenModel genModel,
+			ISelectionProvider selectionProvider) {
+			super(text, types, genModel, selectionProvider);
+		}
+
+		@Override
+		public void run() {
+			if (getGenModel() == null) {
+				showNoGenModelDialog();
+				return;
+			}
+			super.run();
+		}
+
+		@Override
+		protected Action getJavaCodeAction(String text, Object[] types) {
+			return new CreateEcoreJavaCodeAction(text, types, getGenModel(), getSelectionProvider());
+		}
+
+		private void showNoGenModelDialog() {
+			MessageDialog.openConfirm(Display.getCurrent().getActiveShell(),
+				Messages.GenerateEcoreEditorJavaCodeAction_noGenModelDialogTitle,
+				Messages.GenerateEcoreEditorJavaCodeAction_noGenModelDialogMessage);
+		}
+
+	}
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/toolbaractions/GenerateJavaCodeAction.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/toolbaractions/GenerateJavaCodeAction.java
index 13462b1d2d..bcf065749c 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/toolbaractions/GenerateJavaCodeAction.java
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/toolbaractions/GenerateJavaCodeAction.java
@@ -40,6 +40,7 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecp.view.spi.model.reporting.StatusReport;
 import org.eclipse.emfforms.internal.editor.genmodel.Activator;
+import org.eclipse.emfforms.internal.editor.genmodel.Messages;
 import org.eclipse.emfforms.internal.editor.genmodel.util.PluginXmlUtil;
 import org.eclipse.emfforms.spi.editor.IToolbarAction;
 import org.eclipse.emfforms.spi.editor.helpers.ResourceUtil;
@@ -59,23 +60,34 @@ import org.eclipse.swt.widgets.Menu;
 import org.osgi.framework.FrameworkUtil;
 
 /**
- *
  * The ToolbarAction allowing the User to generate Java code for the currently visible Genmodel.
  *
  * @author Clemens Elflein
  */
 public class GenerateJavaCodeAction implements IToolbarAction {
 
+	@Override
+	public Action getAction(Object currentObject, ISelectionProvider selectionProvider) {
+		final ResourceSet resourceSet = (ResourceSet) currentObject;
+		final GenModel genModel = getGenModel(resourceSet);
+		return new CreateJavaCodeAction(genModel, selectionProvider);
+	}
+
 	/**
+	 * Returns the first {@link GenModel} object found in the first of the given {@link ResourceSet}.
 	 *
-	 * {@inheritDoc}
-	 *
-	 * @see org.eclipse.emfforms.spi.editor.IToolbarAction#getAction(java.lang.Object,
-	 *      org.eclipse.jface.viewers.ISelectionProvider)
+	 * @param resourceSet the {@link ResourceSet} to check
+	 * @return the {@link GenModel} or <code>null</code> if none was found
 	 */
-	@Override
-	public Action getAction(Object currentObject, ISelectionProvider selectionProvider) {
-		return new CreateJavaCodeAction(currentObject, selectionProvider);
+	protected GenModel getGenModel(ResourceSet resourceSet) {
+		if (resourceSet.getResources().isEmpty()) {
+			return null;
+		}
+		final Resource topResource = resourceSet.getResources().get(0);
+		if (!topResource.getContents().isEmpty() && GenModel.class.isInstance(topResource.getContents().get(0))) {
+			return (GenModel) topResource.getContents().get(0);
+		}
+		return null;
 	}
 
 	@Override
@@ -84,46 +96,55 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 		if (!(object instanceof ResourceSet)) {
 			return false;
 		}
-		// Check, if the ResourceSet contains a Genmodel. If so, we also can't execute our Action
+		// We can execute our Action only if the ResourceSet contains a GenModel
 		final ResourceSet resourceSet = (ResourceSet) object;
-		for (final Resource r : resourceSet.getResources()) {
-			if (r.getContents().size() > 0 && r.getContents().get(0) instanceof GenModel) {
-				return true;
-			}
-		}
-		return false;
+		final GenModel genModel = getGenModel(resourceSet);
+		return genModel != null;
 	}
 
 	/**
 	 * ToolbarAction to generate Java Code. It also provides the DropDown menu to create
 	 * each type separately (Model, Edit, Editor, Tests).
 	 */
-	private static class CreateJavaCodeAction extends Action {
+	class CreateJavaCodeAction extends Action {
 		private final Object[] types;
-		private final Object currentObject;
 		private final ISelectionProvider selectionProvider;
+		private final GenModel genModel;
+		private static final String FILE_NAME_PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
+		private static final String FILE_NAME_META_INF = "META-INF"; //$NON-NLS-1$
+		private static final String FILE_NAME_MANIFEST_MF = "MANIFEST.MF"; //$NON-NLS-1$
+		private static final String REQUIRE_BUNDLE_HEADER = "Require-Bundle"; //$NON-NLS-1$
+		private static final String EDITOR_BUNDLE_NAME = "org.eclipse.emfforms.editor";//$NON-NLS-1$
+		private static final String EDITOR_BUNDLE_VERSION = "1.8.0";//$NON-NLS-1$
+		private static final String EMFFORMS_EDITOR_CLASS_NAME = "org.eclipse.emfforms.spi.editor.GenericEditor";//$NON-NLS-1$
+		private static final String EMFFORMS_EDITOR_NAME = "EMFForms Editor";//$NON-NLS-1$
+		private static final String EMFFORMS_EDITOR_ID = "emfformseditor";//$NON-NLS-1$
 
-		public static final String FILE_NAME_PLUGIN_XML = "plugin.xml";
-		public static final String FILE_NAME_META_INF = "META-INF";
-		public static final String FILE_NAME_MANIFEST_MF = "MANIFEST.MF";
-		public static final String REQUIRE_BUNDLE_HEADER = "Require-Bundle";
-		public static final String EDITOR_BUNDLE_NAME = "org.eclipse.emfforms.editor";
-		public static final String EDITOR_BUNDLE_VERSION = "1.8.0";
-		public static final String EMFFORMS_EDITOR_CLASS_NAME = "org.eclipse.emfforms.spi.editor.GenericEditor";
-		public static final String EMFFORMS_EDITOR_NAME = "EMFForms Editor";
-		public static final String EMFFORMS_EDITOR_ID = "emfformseditor";
-
-		CreateJavaCodeAction(String text, Object[] types, Object currentObject, ISelectionProvider selectionProvider) {
+		/**
+		 * Constructor.
+		 *
+		 * @param text the string used as the text for the action, or null if there is no text
+		 * @param types the project types
+		 * @param genModel the {@link GenModel}
+		 * @param selectionProvider the {@link ISelectionProvider}
+		 */
+		CreateJavaCodeAction(String text, Object[] types, GenModel genModel, ISelectionProvider selectionProvider) {
 			super(text);
 			this.types = types;
-			this.currentObject = currentObject;
+			this.genModel = genModel;
 			this.selectionProvider = selectionProvider;
 		}
 
-		CreateJavaCodeAction(Object currentObject, ISelectionProvider selectionProvider) {
-			super("Generate All", SWT.DROP_DOWN);
+		/**
+		 * Constructor.
+		 *
+		 * @param genModel the {@link GenModel}
+		 * @param selectionProvider the {@link ISelectionProvider}
+		 */
+		CreateJavaCodeAction(GenModel genModel, ISelectionProvider selectionProvider) {
+			super(Messages.GenerateJavaCodeAction_generateAll, SWT.DROP_DOWN);
 			this.selectionProvider = selectionProvider;
-			this.currentObject = currentObject;
+			this.genModel = genModel;
 
 			types = new Object[] {
 				GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE,
@@ -135,23 +156,27 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 			setMenuCreator(new GenmodelDropdownCreator(selectionProvider));
 
 			setImageDescriptor(ImageDescriptor.createFromURL(FrameworkUtil.getBundle(
-				this.getClass()).getResource("icons/page_white_cup.png")));
+				this.getClass()).getResource("icons/page_white_cup.png"))); //$NON-NLS-1$
 		}
 
 		/**
-		 * {@inheritDoc}
+		 * Returns the Java code generation action.
 		 *
-		 * @see org.eclipse.jface.action.Action#run()
+		 * @param text the text of the Action
+		 * @param types the project types
+		 * @return a new Action
 		 */
+		protected Action getJavaCodeAction(String text, Object[] types) {
+			return new CreateJavaCodeAction(text, types, getGenModel(), selectionProvider);
+		}
+
 		@Override
 		public void run() {
-			final ResourceSet resourceSet = (ResourceSet) currentObject;
-			final GenModel genmodel = (GenModel) resourceSet.getResources().get(0).getContents().get(0);
 			final ISelection oldSelection = selectionProvider.getSelection();
-			selectionProvider.setSelection(new StructuredSelection(resourceSet));
-			genmodel.reconcile();
+			selectionProvider.setSelection(new StructuredSelection(getGenModel()));
+			getGenModel().reconcile();
 			selectionProvider.setSelection(oldSelection);
-			final IRunnableWithProgress generateCodeRunnable = new GenerateJavaCodeRunnable(genmodel);
+			final IRunnableWithProgress generateCodeRunnable = new GenerateJavaCodeRunnable(getGenModel());
 
 			try {
 				new ProgressMonitorDialog(Display.getCurrent().getActiveShell()).run(true, false, generateCodeRunnable);
@@ -165,19 +190,38 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 		}
 
 		/**
+		 * @return the genModel
+		 */
+		public GenModel getGenModel() {
+			return genModel;
+		}
+
+		/**
+		 * @return the selectionProvider
+		 */
+		public ISelectionProvider getSelectionProvider() {
+			return selectionProvider;
+		}
+
+		/**
 		 * {@link IRunnableWithProgress} to execute code generation.
 		 */
 		public class GenerateJavaCodeRunnable implements IRunnableWithProgress {
 
 			private final GenModel genmodel;
 
+			/**
+			 * Constructor.
+			 *
+			 * @param genmodel the {@link GenModel}
+			 */
 			GenerateJavaCodeRunnable(GenModel genmodel) {
 				this.genmodel = genmodel;
 			}
 
 			@Override
 			public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-				monitor.beginTask("Generating Code", IProgressMonitor.UNKNOWN);
+				monitor.beginTask(Messages.GenerateJavaCodeAction_generatingCodeTask, IProgressMonitor.UNKNOWN);
 
 				genmodel.setCanGenerate(true);
 
@@ -259,13 +303,13 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 					final Attributes attributes = originalManifest.getMainAttributes();
 					String newValue = attributes.getValue(REQUIRE_BUNDLE_HEADER);
 					if (newValue == null) {
-						newValue = "";
+						newValue = ""; //$NON-NLS-1$
 					} else {
-						newValue += ",";
+						newValue += ","; //$NON-NLS-1$
 					}
 					newValue += EDITOR_BUNDLE_NAME;
 					if (EDITOR_BUNDLE_VERSION != null) {
-						newValue += ";bundle-version=\"" + EDITOR_BUNDLE_VERSION + "\"";
+						newValue += ";bundle-version=\"" + EDITOR_BUNDLE_VERSION + "\""; //$NON-NLS-1$ //$NON-NLS-2$
 					}
 					attributes.putValue(REQUIRE_BUNDLE_HEADER, newValue);
 					final ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -296,7 +340,7 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 					 * stringBuffer.append(genPackage.getPrefix());
 					 * stringBuffer.append("ModelFile.gif\"");
 					 */
-					MessageFormat.format("icons/full/obj16/{0}ModelFile.gif", genPackage.getPrefix()),
+					MessageFormat.format("icons/full/obj16/{0}ModelFile.gif", genPackage.getPrefix()), //$NON-NLS-1$
 					/**
 					 * Default id is the fully qualified generated editor class appended by ID.
 					 * e.g.: org.eclipse.emf.ecp.makeithappen.model.task.presentation.TaskEditorID
@@ -305,7 +349,7 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 					 * emfformseditor.
 					 * e.g.: org.eclipse.emf.ecp.makeithappen.model.editor.Task.emfformseditor
 					 */
-					MessageFormat.format("{0}.{1}.{2}", genmodel.getEditorPluginID(), genPackage.getPrefix(),
+					MessageFormat.format("{0}.{1}.{2}", genmodel.getEditorPluginID(), genPackage.getPrefix(), //$NON-NLS-1$
 						EMFFORMS_EDITOR_ID),
 					EMFFORMS_EDITOR_NAME);
 			}
@@ -326,11 +370,6 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 				this.selectionProvider = selectionProvider;
 			}
 
-			/**
-			 * {@inheritDoc}
-			 *
-			 * @see org.eclipse.jface.action.IMenuCreator#dispose()
-			 */
 			@Override
 			public void dispose() {
 				if (dropDown != null) {
@@ -338,41 +377,26 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 				}
 			}
 
-			/**
-			 * {@inheritDoc}
-			 *
-			 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-			 */
 			@Override
 			public Menu getMenu(Control parent) {
 				dispose();
 
 				dropDown = new Menu(parent);
-				final Action generateModelAndEdit = new CreateJavaCodeAction("Generate Model + Edit",
-					new Object[] {
-						GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE,
-						GenBaseGeneratorAdapter.EDIT_PROJECT_TYPE
-					}, currentObject, selectionProvider);
-
-				final Action generateModel = new CreateJavaCodeAction("Generate Model",
-					new Object[] {
-						GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE
-					}, currentObject, selectionProvider);
-
-				final Action generateEdit = new CreateJavaCodeAction("Generate Edit",
-					new Object[] {
-						GenBaseGeneratorAdapter.EDIT_PROJECT_TYPE
-					}, currentObject, selectionProvider);
-
-				final Action generateEditor = new CreateJavaCodeAction("Generate Editor",
-					new Object[] {
-						GenBaseGeneratorAdapter.EDITOR_PROJECT_TYPE
-					}, currentObject, selectionProvider);
-
-				final Action generateTests = new CreateJavaCodeAction("Generate Tests",
-					new Object[] {
-						GenBaseGeneratorAdapter.TESTS_PROJECT_TYPE
-					}, currentObject, selectionProvider);
+				final Action generateModelAndEdit = getJavaCodeAction(
+					Messages.GenerateJavaCodeAction_generateModelEdit, new Object[] {
+						GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE, GenBaseGeneratorAdapter.EDIT_PROJECT_TYPE });
+
+				final Action generateModel = getJavaCodeAction(Messages.GenerateJavaCodeAction_generateModel,
+					new Object[] { GenBaseGeneratorAdapter.MODEL_PROJECT_TYPE });
+
+				final Action generateEdit = getJavaCodeAction(Messages.GenerateJavaCodeAction_generateEdit,
+					new Object[] { GenBaseGeneratorAdapter.EDIT_PROJECT_TYPE });
+
+				final Action generateEditor = getJavaCodeAction(Messages.GenerateJavaCodeAction_generateEditor,
+					new Object[] { GenBaseGeneratorAdapter.EDITOR_PROJECT_TYPE });
+
+				final Action generateTests = getJavaCodeAction(Messages.GenerateJavaCodeAction_generateTests,
+					new Object[] { GenBaseGeneratorAdapter.TESTS_PROJECT_TYPE });
 
 				new ActionContributionItem(generateModelAndEdit).fill(dropDown, 0);
 				new ActionContributionItem(generateModel).fill(dropDown, 1);
@@ -383,11 +407,6 @@ public class GenerateJavaCodeAction implements IToolbarAction {
 				return dropDown;
 			}
 
-			/**
-			 * {@inheritDoc}
-			 *
-			 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-			 */
 			@Override
 			public Menu getMenu(Menu parent) {
 				return null;
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/util/PluginXmlUtil.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/util/PluginXmlUtil.java
index 357a140265..bfdcbef91d 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/util/PluginXmlUtil.java
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/util/PluginXmlUtil.java
@@ -85,15 +85,15 @@ public final class PluginXmlUtil {
 		}
 
 		final Element plugin = document.getDocumentElement();
-		final Element editor = document.createElement("editor");
-		editor.setAttribute("class", editorClass);
-		editor.setAttribute("default", Boolean.toString(defaultEditor));
-		editor.setAttribute("extensions", extensions);
-		editor.setAttribute("icon", icon);
-		editor.setAttribute("id", id);
-		editor.setAttribute("name", name);
-		final Element extension = document.createElement("extension");
-		extension.setAttribute("point", "org.eclipse.ui.editors");
+		final Element editor = document.createElement("editor"); //$NON-NLS-1$
+		editor.setAttribute("class", editorClass); //$NON-NLS-1$
+		editor.setAttribute("default", Boolean.toString(defaultEditor)); //$NON-NLS-1$
+		editor.setAttribute("extensions", extensions); //$NON-NLS-1$
+		editor.setAttribute("icon", icon); //$NON-NLS-1$
+		editor.setAttribute("id", id); //$NON-NLS-1$
+		editor.setAttribute("name", name); //$NON-NLS-1$
+		final Element extension = document.createElement("extension"); //$NON-NLS-1$
+		extension.setAttribute("point", "org.eclipse.ui.editors"); //$NON-NLS-1$ //$NON-NLS-2$
 		plugin.appendChild(extension);
 		extension.appendChild(editor);
 
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
index 56f94227f4..e3350f93e8 100644
--- a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewModel Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor.viewmodel;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
+Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui.ide;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
index aed0aab9a3..8c96c390b5 100644
--- a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.viewmodel</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
index 5c547d6243..cc30484b18 100644
--- a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Editor based on EMFForms
 Bundle-SymbolicName: org.eclipse.emfforms.editor;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emfforms.internal.editor.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.handlers;version="1.12.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.editor.toolbaractions;version="1.12.0";;x-internal:=true;x-internal:=true,
- org.eclipse.emfforms.internal.editor.ui;version="1.12.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.spi.editor;version="1.12.0",
- org.eclipse.emfforms.spi.editor.handler;version="1.12.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.12.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel"
+Export-Package: org.eclipse.emfforms.internal.editor;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.handlers;version="1.13.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.editor.toolbaractions;version="1.13.0";;x-internal:=true;x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ui;version="1.13.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.spi.editor;version="1.13.0",
+ org.eclipse.emfforms.spi.editor.handler;version="1.13.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.13.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor/pom.xml b/bundles/org.eclipse.emfforms.editor/pom.xml
index 6181c61e64..e167682d3f 100644
--- a/bundles/org.eclipse.emfforms.editor/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/EMFUndoRedoActionBarContributor.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/EMFUndoRedoActionBarContributor.java
index 4c2d75d30c..126cb84897 100644
--- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/EMFUndoRedoActionBarContributor.java
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/EMFUndoRedoActionBarContributor.java
@@ -27,6 +27,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IPropertyListener;
@@ -342,7 +343,14 @@ public class EMFUndoRedoActionBarContributor
 
 	@Override
 	public void propertyChanged(Object source, int id) {
-		update();
+		Display.getDefault().asyncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				update();
+			}
+		});
+
 	}
 }
 // END REUSED CLASS
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
index 186766716a..a23c6362c4 100644
--- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
@@ -185,24 +185,32 @@ public class GenericEditor extends EditorPart implements IEditingDomainProvider,
 	 * @param changedResources A List of changed Resources
 	 * @param removedResources A List of removed Resources
 	 */
-	protected void handleResourceChange(Collection<Resource> changedResources, Collection<Resource> removedResources) {
+	protected void handleResourceChange(final Collection<Resource> changedResources,
+		final Collection<Resource> removedResources) {
 		if (!isDirty()) {
-			if (resourceSet == null || rootView.isDisposed()) {
-				return;
-			}
-			reloading = true;
-			resourceSet.getResources().removeAll(removedResources);
-			for (final Resource changed : changedResources) {
-				changed.unload();
-				try {
-					changed.load(null);
-				} catch (final IOException ex) {
+			getSite().getShell().getDisplay().asyncExec(new Runnable() {
+				@Override
+				public void run() {
+					if (resourceSet == null || rootView.isDisposed()) {
+						return;
+					}
+					reloading = true;
+					resourceSet.getResources().removeAll(removedResources);
+					for (final Resource changed : changedResources) {
+						changed.unload();
+						try {
+							changed.load(null);
+						} catch (final IOException ex) {
+						}
+					}
+
+					rootView.getSelectionProvider().refresh();
+
+					reloading = false;
+					getCommandStack().flush();
+					initMarkers();
 				}
-			}
-			rootView.getSelectionProvider().refresh();
-			reloading = false;
-			getCommandStack().flush();
-			initMarkers();
+			});
 		} else {
 			filesChangedWithConflict = true;
 		}
diff --git a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
index 50a9f85350..6ffcf10d84 100644
--- a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Localization
 Bundle-SymbolicName: org.eclipse.emfforms.localization
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.localization;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.12.0"
+Export-Package: org.eclipse.emfforms.internal.localization;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.13.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/localizationService.xml
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.11.0,1.12.0]",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0]",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0]",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0]",
  org.eclipse.osgi.service.localization;version="[1.1.0,2.0.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.component.annotations;version="1.2.0",
diff --git a/bundles/org.eclipse.emfforms.localization/pom.xml b/bundles/org.eclipse.emfforms.localization/pom.xml
index 6048db5ade..075edfd5a4 100644
--- a/bundles/org.eclipse.emfforms.localization/pom.xml
+++ b/bundles/org.eclipse.emfforms.localization/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
index 685fa65a96..3287fa2d0f 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emfforms.spi.rulerepository.model.provider.RulerepositoryEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.rulerepository.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
index e712138111..29d87a8b55 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
index 15a1a05bd7..eb21421421 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.12.0",
- org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.12.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
- org.eclipse.emfforms.spi.rulerepository.model.util;version="1.12.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.13.0",
+ org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.13.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
+ org.eclipse.emfforms.spi.rulerepository.model.util;version="1.13.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
index afc46b56f9..3c54d06113 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
index 87962ed100..6d155de032 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms RuleRepository Tooling
 Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
@@ -14,19 +14,19 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.rulerepository.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
index b0f5ea0bc6..bf909be1ea 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-bundles-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>

   </parent>

 

diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryEditor.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryEditor.java
index 329a055237..343a0edcaa 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryEditor.java
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryEditor.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.xml.type.AnyType;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.eclipse.emf.ecp.view.spi.model.VView;
 import org.eclipse.emfforms.internal.editor.toolbaractions.LoadEcoreAction;
 import org.eclipse.emfforms.spi.editor.GenericEditor;
diff --git a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
index d0c1d504db..f0bdd1cb8a 100644
--- a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
@@ -2,47 +2,47 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Base Dependencies
 Bundle-SymbolicName: org.eclipse.emfforms.setup.base
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.13.0,1.14.0)"
diff --git a/bundles/org.eclipse.emfforms.setup.base/pom.xml b/bundles/org.eclipse.emfforms.setup.base/pom.xml
index 3b8e546124..42d10dd34e 100644
--- a/bundles/org.eclipse.emfforms.setup.base/pom.xml
+++ b/bundles/org.eclipse.emfforms.setup.base/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
index 532ceaf55c..25b053b3f2 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Categorization renderer using an Expandbar
 Bundle-SymbolicName: org.eclipse.emfforms.swt.categorization.expandbar
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.rap.rwt;bundle-version="[3.0.2,4.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
@@ -16,13 +16,13 @@ Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1
  org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: javax.inject;version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
index 43e57b049f..a3e21fff0c 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.categorization.expandbar</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
index 9acacedecd..0669b81e22 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Renderer for Multi EAttributes
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.multiattribute;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.control.multiattribute;version="1.12.0",
- org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.control.multiattribute;version="1.13.0",
+ org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.core.runtime;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml b/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
index f745c762b2..28074cc396 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/celleditor/CellEditorFactory.java b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/celleditor/CellEditorFactory.java
index 09be45d0be..69ee1989db 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/celleditor/CellEditorFactory.java
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/celleditor/CellEditorFactory.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.internal.swt.util.PreSetValidationListeners;
 import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;
 import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
 import org.eclipse.emfforms.spi.common.report.AbstractReport;
@@ -32,6 +33,7 @@ import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -102,7 +104,7 @@ public final class CellEditorFactory {
 	 * @param viewModelContext the {@link ViewModelContext}
 	 * @return a {@link ECPCellEditor} or a {@link TextCellEditor} as a fallback
 	 */
-	public CellEditor createCellEditor(EAttribute multiAttribute, EObject eObject, Table table,
+	public CellEditor createCellEditor(final EAttribute multiAttribute, final EObject eObject, Table table,
 		ViewModelContext viewModelContext) {
 		double bestPriority = -Double.MIN_VALUE;
 		CellEditorDescriptor bestCandidate = null;
@@ -123,6 +125,11 @@ public final class CellEditorFactory {
 		if (result == null) {
 			result = new TextCellEditor(table);
 		}
+
+		if (Text.class.isInstance(result.getControl())) {
+			PreSetValidationListeners.create().verify((Text) result.getControl(), multiAttribute);
+		}
+
 		return result;
 	}
 
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
index 09a9b46260..4ebd19f18a 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
@@ -197,7 +197,7 @@ public class MultiAttributeSWTRenderer extends AbstractControlSWTRenderer<VContr
 	 * @return the image
 	 */
 	protected Image getImage(String path) {
-		return imageRegistryService.getImage(FrameworkUtil.getBundle(getClass()), path);
+		return imageRegistryService.getImage(FrameworkUtil.getBundle(MultiAttributeSWTRenderer.class), path);
 	}
 
 	private Button createRemoveRowButton(final Composite buttonComposite, IObservableList list, EAttribute attribute) {
@@ -405,6 +405,36 @@ public class MultiAttributeSWTRenderer extends AbstractControlSWTRenderer<VContr
 		return CellEditorFactory.INSTANCE.createCellEditor(attribute, tempInstance, table, getViewModelContext());
 	}
 
+	/**
+	 * Returns the attribute value which should be added as a new element.
+	 *
+	 * @param attribute the {@link EAttribute} with the data type
+	 * @return the new value
+	 * @since 1.13
+	 */
+	protected Object getValueForNewRow(final EAttribute attribute) {
+		try {
+			Object defaultValue = attribute.getEType().getDefaultValue();
+			if (defaultValue == null) {
+				defaultValue = attribute.getEType().getInstanceClass().getConstructor().newInstance();
+			}
+			return defaultValue;
+		} catch (final InstantiationException ex) {
+			getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
+		} catch (final IllegalAccessException ex) {
+			getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
+		} catch (final IllegalArgumentException ex) {
+			getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
+		} catch (final InvocationTargetException ex) {
+			getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
+		} catch (final NoSuchMethodException ex) {
+			getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
+		} catch (final SecurityException ex) {
+			getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
+		}
+		throw new IllegalStateException();
+	}
+
 	@Override
 	protected void applyValidation() {
 		Display.getDefault().asyncExec(new Runnable() {
@@ -575,27 +605,13 @@ public class MultiAttributeSWTRenderer extends AbstractControlSWTRenderer<VContr
 				final EObject eObject = EObject.class.cast(observing.getObserved());
 				final EAttribute attribute = EAttribute.class.cast(list.getElementType());
 
-				Object defaultValue = attribute.getEType().getDefaultValue();
-				if (defaultValue == null) {
-					defaultValue = attribute.getEType().getInstanceClass().getConstructor().newInstance();
-
-				}
+				final Object defaultValue = getValueForNewRow(attribute);
 				final EditingDomain editingDomain = getEditingDomain(getViewModelContext().getDomainModel());
 				editingDomain.getCommandStack()
 					.execute(AddCommand.create(editingDomain, eObject, attribute, defaultValue));
 				tableViewer.refresh();
-			} catch (final InstantiationException ex) {
-				getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
-			} catch (final IllegalAccessException ex) {
-				getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
-			} catch (final IllegalArgumentException ex) {
-				getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
-			} catch (final InvocationTargetException ex) {
-				getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
-			} catch (final NoSuchMethodException ex) {
-				getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
-			} catch (final SecurityException ex) {
-				getReportService().report(new AbstractReport(ex, Messages.MultiAttributeSWTRenderer_AddFailed));
+			} catch (final IllegalStateException ex) {
+				/* logged by getValueForNewRow* already */
 			}
 		}
 	}
@@ -795,7 +811,8 @@ public class MultiAttributeSWTRenderer extends AbstractControlSWTRenderer<VContr
 		final IObservableList oldList = (IObservableList) getTableViewer().getInput();
 		oldList.dispose();
 
-		final IObservableList list = getEMFFormsDatabinding().getObservableList(getVElement().getDomainModelReference(),
+		final IObservableList list = getEMFFormsDatabinding().getObservableList(
+			getVElement().getDomainModelReference(),
 			getViewModelContext().getDomainModel());
 		// addRelayoutListenerIfNeeded(list, composite);
 		getTableViewer().setInput(list);
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
index 4747491651..cd9d55d107 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Text Control with Autocomplete
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
index 514fc2b569..df802c0a69 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
index 7bdc3f7333..6386b76d49 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Rich Text Control
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.richtext;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
  org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
index b8c57120a7..fba0bbb96f 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
index eecb033ce4..8d14d98603 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
@@ -36,6 +36,8 @@ import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.MouseEvent;
@@ -118,6 +120,14 @@ public class RichTextControlSWTRenderer extends TextControlSWTRenderer {
 					text.setText(innerText.getText());
 				}
 			});
+			innerText.addKeyListener(new KeyAdapter() {
+				@Override
+				public void keyPressed(KeyEvent e) {
+					if (e.keyCode == 'a' && (isCtrlKeyPressed(e) || isCommandKeyPressed(e))) {
+						innerText.selectAll();
+					}
+				}
+			});
 			popupWindow.open();
 
 		}
@@ -128,6 +138,14 @@ public class RichTextControlSWTRenderer extends TextControlSWTRenderer {
 		}
 	}
 
+	private static boolean isCtrlKeyPressed(KeyEvent e) {
+		return (e.stateMask & SWT.MODIFIER_MASK) == SWT.CTRL;
+	}
+
+	private static boolean isCommandKeyPressed(KeyEvent e) {
+		return (e.stateMask & SWT.MODIFIER_MASK) == SWT.COMMAND;
+	}
+
 	/**
 	 * Specifies the preferred size of the popup window.
 	 *
diff --git a/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
index c1a4862ae4..5f7430b184 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Control Grid SWT Renderer
 Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.12.0"
-Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.13.0"
+Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml b/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
index 81f2d020b6..82c6b44cb3 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
index c7c424c4b2..3db663f193 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Core DI Extension
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/emfFormsDIExtensionRendererFactory.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml b/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
index d8f078f28c..f1390fb1ea 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.swt.core.di.extension</artifactId>
 <packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
index 30eaa73867..2fc1cd25c1 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core DI
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core.di;version="1.12.0"
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core.di;version="1.13.0"
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
 Service-Component: OSGI-INF/emfFormsDIRendererFactory.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.core.di/pom.xml b/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
index 4febb5f418..1752d3d5a3 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <artifactId>org.eclipse.emfforms.swt.core.di</artifactId>
 <packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
index 5272b3eb54..b63d5fef78 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core Plugin
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.plugin
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.core.plugin.LegacyAdditionalRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.swt.core.plugin.LegacyRendererService.xml
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml b/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
index 7c610bc805..730e931d46 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
index 25795a78b3..eac809720d 100644
--- a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.12.0",
- org.eclipse.emfforms.spi.swt.core.data;version="1.12.0",
- org.eclipse.emfforms.spi.swt.core.layout;version="1.12.0",
- org.eclipse.emfforms.spi.swt.core.util;version="1.12.0",
- org.eclipse.emfforms.swt.core;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.core.data;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.core.layout;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.core.util;version="1.13.0",
+ org.eclipse.emfforms.swt.core;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.custom;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.core/pom.xml b/bundles/org.eclipse.emfforms.swt.core/pom.xml
index f81c67036f..4bde999779 100644
--- a/bundles/org.eclipse.emfforms.swt.core/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
index b156797ee4..dad3607ff8 100644
--- a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table
 Bundle-SymbolicName: org.eclipse.emfforms.swt.table
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.messages;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.util;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.12.0",
- org.eclipse.emfforms.spi.swt.table.util;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.messages;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.table.util;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding.swt;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.table/pom.xml b/bundles/org.eclipse.emfforms.swt.table/pom.xml
index 4827a87333..130add04a3 100644
--- a/bundles/org.eclipse.emfforms.swt.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.table/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.table</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java
index 0f7c3deaed..2ee603782b 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java
@@ -19,6 +19,7 @@ import org.eclipse.emfforms.common.Optional;
 import org.eclipse.emfforms.spi.swt.table.ButtonBarBuilder;
 import org.eclipse.emfforms.spi.swt.table.DNDProvider;
 import org.eclipse.emfforms.spi.swt.table.DefaultButtonBarBuilder;
+import org.eclipse.emfforms.spi.swt.table.DefaultTableViewerCompositeBuilder;
 import org.eclipse.emfforms.spi.swt.table.NewElementCreator;
 import org.eclipse.emfforms.spi.swt.table.TableViewerCompositeBuilder;
 import org.eclipse.emfforms.spi.swt.table.TableViewerCreator;
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
index 771f286264..420ff58d49 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
@@ -135,9 +135,12 @@ public abstract class AbstractTableViewerComposite extends Composite {
 			final Integer storedMinWidth = (Integer) tableColumn.getData(MIN_WIDTH);
 			if (storedWeight == ColumnDescription.NO_WEIGHT) {
 				layout.setColumnData(tableColumn, new ColumnPixelData(storedMinWidth, storedIsResizable));
-			} else {
+			} else if (storedMinWidth > 0) {
 				layout.setColumnData(tableColumn,
 					new ColumnWeightData(storedWeight, storedMinWidth, storedIsResizable));
+			} else {
+				layout.setColumnData(tableColumn,
+					new ColumnWeightData(storedWeight, storedIsResizable));
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableViewerCompositeBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultTableViewerCompositeBuilder.java
index 48431a1990..6552ba6554 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableViewerCompositeBuilder.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultTableViewerCompositeBuilder.java
@@ -9,16 +9,16 @@
  * Contributors:
  * Johannes Faltermeier - initial API and implementation
  ******************************************************************************/
-package org.eclipse.emfforms.internal.swt.table;
+package org.eclipse.emfforms.spi.swt.table;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.emfforms.common.Optional;
-import org.eclipse.emfforms.spi.swt.table.TableViewerCompositeBuilder;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -51,23 +51,50 @@ public class DefaultTableViewerCompositeBuilder implements TableViewerCompositeB
 		GridLayoutFactory.fillDefaults().numColumns(3).equalWidth(false).applyTo(topComposite);
 
 		/* Title label */
-		titleLabel = new Label(topComposite, SWT.NONE);
-		titleLabel.setBackground(parent.getBackground());
-		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).grab(true, false).applyTo(titleLabel);
+		titleLabel = createTitleLabel(topComposite, parent.getBackground());
 
 		/* Validation icon label */
 		validationLabel = createValidationLabel(topComposite);
 
 		/* Button composite */
-		buttonComposite = new Composite(topComposite, SWT.NONE);
-		buttonComposite.setBackground(topComposite.getBackground());
-		GridDataFactory.fillDefaults().align(SWT.END, SWT.BEGINNING).grab(true, false).applyTo(buttonComposite);
+		buttonComposite = createButtonComposite(topComposite);
 
 		/* Bottom composite */
 		viewerComposite = createViewerComposite(composite);
 	}
 
 	/**
+	 * Returns the {@link Label} displaying the table viewer's label. Can be overwritten to customize the label's
+	 * appearance.
+	 *
+	 * @param parentComposite The parent composite of the created label
+	 * @param background The background color of the label
+	 *
+	 * @return The title label
+	 */
+	protected Label createTitleLabel(final Composite parentComposite, Color background) {
+		final Label titleLabel = new Label(parentComposite, SWT.NONE);
+		titleLabel.setBackground(background);
+		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).grab(true, false).applyTo(titleLabel);
+		return titleLabel;
+	}
+
+	/**
+	 * Creates and returns the button composite used by this table viewer. Can be overwritten to customize the
+	 * composite's appearance and placement.
+	 *
+	 * @param parentComposite The composite that will contain the button composite
+	 * @return The button composite
+	 */
+	protected Composite createButtonComposite(final Composite parentComposite) {
+		final Composite buttonComposite = new Composite(parentComposite, SWT.NONE);
+		buttonComposite.setBackground(parentComposite.getBackground());
+		GridDataFactory.fillDefaults().align(SWT.END, SWT.BEGINNING).grab(true, false)
+			.applyTo(buttonComposite);
+		return buttonComposite;
+	}
+
+	/**
 	 * Called to create the composite for the table viewer.
 	 *
 	 * @param composite the parent
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
index 6af4939e44..f0b35021ac 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms TreeViewer Validation Decorator using ECP Validation Service
 Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.12.0"
+Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.13.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jface.resource;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
index 707cf76cca..752c9fcfed 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
index da5dbae7d9..5cb1be2cbe 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
@@ -2,29 +2,30 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Treemasterdetail SWT Util
 Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.12.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.12.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
- org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.12.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.12.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.12.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.12.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.12.0"
+Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.13.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.13.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
+ org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.13.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.13.0"
 Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.equinox.registry;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.commands;version="0.0.0",
  org.eclipse.emf.edit.ui.dnd;version="0.0.0",
  org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.13.0,1.14.0)",
  org.eclipse.jface.action;version="0.0.0",
  org.eclipse.jface.databinding.viewers;version="0.0.0",
  org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.emfforms.swt.treemasterdetail/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..c2eb59eaa4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2013 EclipseSource.
+# 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:
+#    EclipseSource - initial API and implementation
+################################################################################
+
+
+#reference messages
+PasteInParent=Paste in parent 
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/build.properties b/bundles/org.eclipse.emfforms.swt.treemasterdetail/build.properties
index 88b182b466..58c80c0e3d 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/build.properties
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/build.properties
@@ -4,6 +4,7 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               about.html
+               about.html,\
+               OSGI-INF/
 src.includes = icons/,\
                about.html
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
index e6b67045cc..7991195b2e 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
@@ -7,12 +7,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.treemasterdetail</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
index 37b1e56c06..6071bb7a44 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
@@ -12,6 +12,9 @@
  ******************************************************************************/
 package org.eclipse.emfforms.spi.swt.treemasterdetail;
 
+import java.util.LinkedHashSet;
+import java.util.Set;
+
 import org.eclipse.core.databinding.observable.ChangeEvent;
 import org.eclipse.core.databinding.observable.IChangeListener;
 import org.eclipse.core.internal.databinding.observable.DelayedObservableValue;
@@ -31,6 +34,7 @@ import org.eclipse.emf.ecp.view.treemasterdetail.model.VTreeMasterDetail;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.util.DetailPanelRenderingFinishedCallback;
 import org.eclipse.emfforms.spi.swt.treemasterdetail.util.RootObject;
 import org.eclipse.jface.databinding.viewers.IViewerObservableValue;
 import org.eclipse.jface.databinding.viewers.ViewersObservables;
@@ -127,6 +131,7 @@ public class TreeMasterDetailComposite extends Composite implements IEditingDoma
 	private final int renderDelay;
 
 	private ViewModelPropertiesUpdateCallback viewModelPropertiesUpdateCallback;
+	private final Set<DetailPanelRenderingFinishedCallback> detailPanelRenderingFinishedCallbacks = new LinkedHashSet<DetailPanelRenderingFinishedCallback>();
 
 	/** The CreateElementCallback to allow modifications to the newly created element. */
 
@@ -296,6 +301,7 @@ public class TreeMasterDetailComposite extends Composite implements IEditingDoma
 		final Object selectedObject = treeViewer.getSelection() != null ? ((StructuredSelection) treeViewer
 			.getSelection()).getFirstElement() : null;
 
+		boolean asyncRendering = false;
 		if (selectedObject instanceof EObject) {
 			lastRenderedObject = selectedObject;
 			final EObject eObject = EObject.class.cast(selectedObject);
@@ -313,6 +319,7 @@ public class TreeMasterDetailComposite extends Composite implements IEditingDoma
 				 */
 				detailPanel.layout();
 				renderedView.getViewModelContext().changeDomainModel(eObject);
+				updateScrolledComposite();
 			} else {
 				if (viewModelPropertiesUpdateCallback != null) {
 					viewModelPropertiesUpdateCallback.updateViewModelProperties(context);
@@ -336,17 +343,32 @@ public class TreeMasterDetailComposite extends Composite implements IEditingDoma
 					label.setText("loading...");
 					GridDataFactory.fillDefaults().align(SWT.CENTER, SWT.CENTER).grab(true, true).applyTo(label);
 					detailPanel.layout(true, true);
+					asyncRendering = true;
 					Display.getDefault().asyncExec(new UpdateDetailRunnable(setFocusToDetail, eObject, label));
 				}
 				// After rendering the Forms, compute the size of the form. So the scroll container knows when to scroll
-				if (ScrolledComposite.class.isInstance(detailComposite)) {
-					ScrolledComposite.class.cast(detailComposite)
-						.setMinSize(detailPanel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-				}
+				updateScrolledComposite();
 			}
 		} else {
 			renderEmptyDetailPanel();
 		}
+
+		/*
+		 * Notify the callbacks that the rendering has been finished.
+		 * In case of async rendering, the async process needs to notify the callbacks.
+		 */
+		if (!asyncRendering) {
+			for (final DetailPanelRenderingFinishedCallback callback : detailPanelRenderingFinishedCallbacks) {
+				callback.renderingFinished(selectedObject);
+			}
+		}
+	}
+
+	private void updateScrolledComposite() {
+		if (ScrolledComposite.class.isInstance(detailComposite)) {
+			ScrolledComposite.class.cast(detailComposite)
+				.setMinSize(detailPanel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+		}
 	}
 
 	private void renderEmptyDetailPanel() {
@@ -375,10 +397,7 @@ public class TreeMasterDetailComposite extends Composite implements IEditingDoma
 		detailPanel.pack();
 		detailPanel.layout(true, true);
 
-		if (ScrolledComposite.class.isInstance(detailComposite)) {
-			ScrolledComposite.class.cast(detailComposite)
-				.setMinSize(detailPanel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		}
+		updateScrolledComposite();
 	}
 
 	/**
@@ -524,6 +543,10 @@ public class TreeMasterDetailComposite extends Composite implements IEditingDoma
 				if (setFocusToDetail) {
 					setFocusToDetail();
 				}
+				// notify callbacks that the rendering was finished
+				for (final DetailPanelRenderingFinishedCallback callback : detailPanelRenderingFinishedCallbacks) {
+					callback.renderingFinished(eObject);
+				}
 			} catch (final ECPRendererException e) {
 			}
 		}
@@ -539,4 +562,28 @@ public class TreeMasterDetailComposite extends Composite implements IEditingDoma
 		ViewModelPropertiesUpdateCallback viewModelPropertiesUpdateCallback) {
 		this.viewModelPropertiesUpdateCallback = viewModelPropertiesUpdateCallback;
 	}
+
+	/**
+	 * Register a callback that is notified whenever the rendering of a detail panel is finished.
+	 *
+	 * @param detailPanelRenderingFinishedCallback the callback
+	 * @return <code>true</code> if the callback has been added, <code>false</code> if it was already registered
+	 * @since 1.13
+	 */
+	public boolean registerDetailPanelRenderingFinishedCallback(
+		DetailPanelRenderingFinishedCallback detailPanelRenderingFinishedCallback) {
+		return detailPanelRenderingFinishedCallbacks.add(detailPanelRenderingFinishedCallback);
+	}
+
+	/**
+	 * Register a callback that is notified whenever the rendering of a detail panel is finished.
+	 *
+	 * @param detailPanelRenderingFinishedCallback the callback
+	 * @return <code>true</code> if the callback has been removed, <code>false</code> if it was not registered
+	 * @since 1.13
+	 */
+	public boolean unregisterDetailPanelRenderingFinishedCallback(
+		DetailPanelRenderingFinishedCallback detailPanelRenderingFinishedCallback) {
+		return detailPanelRenderingFinishedCallbacks.remove(detailPanelRenderingFinishedCallback);
+	}
 }
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/PasteInParentAction.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/PasteInParentAction.java
new file mode 100644
index 0000000000..ef75623712
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/PasteInParentAction.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Jonas Helming - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.CommandActionHandler;
+import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
+
+/**
+ * A paste action that will switch to the parent element of the current selection. It will
+ * create a {@link PasteFromClipboardCommand} either for the selected element or its parent.
+ *
+ * @since 1.13.0
+ */
+public class PasteInParentAction extends CommandActionHandler {
+	private static final String PASTE_IN_PARENT = LocalizationServiceHelper.getString(PasteInParentAction.class,
+		"PasteInParent");
+
+	/**
+	 * Default constructor.
+	 *
+	 * @param domain the {@link EditingDomain}
+	 */
+	public PasteInParentAction(EditingDomain domain) {
+		super(domain, PASTE_IN_PARENT);
+	}
+
+	/**
+	 * Constructor without providing an {@link EditingDomain}.
+	 *
+	 */
+	public PasteInParentAction() {
+		super(null, PASTE_IN_PARENT);
+	}
+
+	@Override
+	public Command createCommand(Collection<?> selection) {
+		if (selection.size() == 1) {
+			final Object next = selection.iterator().next();
+			if (next instanceof EObject) {
+				final EObject eContainer = ((EObject) next).eContainer();
+				if (eContainer != null) {
+					return PasteFromClipboardCommand.create(domain, eContainer, null);
+				}
+			}
+		}
+		return UnexecutableCommand.INSTANCE;
+
+	}
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/PasteInParentMasterDetailAction.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/PasteInParentMasterDetailAction.java
new file mode 100644
index 0000000000..1074904b4f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/PasteInParentMasterDetailAction.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Jonas Helming - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.CommandActionHandler;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+
+/**
+ * Delegates to {@link PasteInParentAction}.
+ *
+ * @author Jonas Helming
+ * @since 1.13
+ *
+ */
+public class PasteInParentMasterDetailAction extends DelegatingMasterDetailAction {
+
+	private static final String ICON_PATH = "icons/paste.gif"; //$NON-NLS-1$
+
+	/**
+	 * Constructor.
+	 *
+	 * @param editingDomain
+	 *            The {@link EditingDomain} for the {@link PasteInParentAction}.
+	 */
+	public PasteInParentMasterDetailAction(EditingDomain editingDomain) {
+		super(editingDomain);
+	}
+
+	@Override
+	protected String getEMFImagePath() {
+		return ICON_PATH;
+	}
+
+	@Override
+	protected CommandActionHandler createDelegatedAction(EditingDomain editingDomain) {
+		return new PasteInParentAction(editingDomain);
+	}
+
+	@Override
+	protected boolean isExecuteOnKeyRelease(KeyEvent event) {
+		return isActivated(event, SWT.CTRL | SWT.SHIFT, 'v');
+	}
+}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/util/DetailPanelRenderingFinishedCallback.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/util/DetailPanelRenderingFinishedCallback.java
new file mode 100644
index 0000000000..cac516371b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/util/DetailPanelRenderingFinishedCallback.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Lucas Koehler - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.treemasterdetail.util;
+
+/**
+ * This interface allows to be notified when the
+ * {@link org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailComposite TreeMasterDetailComposite} finished
+ * rendering a detail pane.
+ *
+ * @author Lucas Koehler
+ * @since 1.13
+ *
+ */
+public interface DetailPanelRenderingFinishedCallback {
+
+	/**
+	 * This method is called after the renderedObject has been rendered.
+	 *
+	 * @param renderedObject The rendered Object
+	 */
+	void renderingFinished(Object renderedObject);
+}
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
index 94dc87eac6..ed62516f91 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfforms.spi.view.annotation.model.provider.AnnotationEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
index cdf4c364e9..fe96b51279 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
index 2ef8a0f4a6..087805bb24 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.12.0",
- org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.12.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.13.0",
+ org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.13.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml b/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
index 9cd7feb6ac..3ca6612e63 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
index dc0f9f2d43..e4b0d15b73 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider.ControlgridEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
-Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.12.0,1.13.0)";resolution:=optional,
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.12.0,1.13.0)";resolution:=optional
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
+Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.13.0,1.14.0)";resolution:=optional,
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.13.0,1.14.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
index bceb17e70b..ebd3a3ddf7 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
index 3d92e0532c..77e40c843a 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.12.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.12.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.13.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.13.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
index 2648d41117..e4ad22137c 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
index ada572dbc2..5df5f5abed 100644
--- a/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Localization
 Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="1.5.0"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.model.localization/pom.xml b/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
index 1331c2f3ae..67d3bd22b0 100644
--- a/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-bundles-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.emfforms.view.model.localization/src/org/eclipse/emfforms/internal/view/model/localization/LocalizationViewModelService.java b/bundles/org.eclipse.emfforms.view.model.localization/src/org/eclipse/emfforms/internal/view/model/localization/LocalizationViewModelService.java
index fc8192ccd4..b2fb33b7fd 100644
--- a/bundles/org.eclipse.emfforms.view.model.localization/src/org/eclipse/emfforms/internal/view/model/localization/LocalizationViewModelService.java
+++ b/bundles/org.eclipse.emfforms.view.model.localization/src/org/eclipse/emfforms/internal/view/model/localization/LocalizationViewModelService.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecp.view.spi.model.LocalizationAdapter;
 import org.eclipse.emf.ecp.view.spi.model.ModelChangeListener;
 import org.eclipse.emf.ecp.view.spi.model.ModelChangeNotification;
 import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VHasTooltip;
 import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
 import org.eclipse.emfforms.spi.common.locale.EMFFormsLocaleChangeListener;
 import org.eclipse.emfforms.spi.common.locale.EMFFormsLocaleProvider;
@@ -139,13 +140,28 @@ public class LocalizationViewModelService implements ViewModelService, EMFFormsL
 			if (localizationAdapter != null) {
 				vElement.setLabel(localizationAdapter.localize(vElement.getName().substring(1)));
 			} else {
-				reportService.report(new AbstractReport(
-					"No LocalizationAdapter found for the current view:" + view.toString())); //$NON-NLS-1$
+				reportAboutMissingLocalizationAdapter();
 				vElement.setLabel(vElement.getName());
 			}
 		} else {
 			vElement.setLabel(vElement.getName());
 		}
+
+		if (vElement instanceof VHasTooltip) {
+			final VHasTooltip tooltip = VHasTooltip.class.cast(vElement);
+			if (tooltip.getTooltip() != null && tooltip.getTooltip().startsWith("%")) { //$NON-NLS-1$
+				if (localizationAdapter != null) {
+					tooltip.setTooltip(localizationAdapter.localize(tooltip.getTooltip().substring(1)));
+				} else {
+					reportAboutMissingLocalizationAdapter();
+				}
+			}
+		}
+	}
+
+	private void reportAboutMissingLocalizationAdapter() {
+		reportService.report(new AbstractReport(
+			"No LocalizationAdapter found for the current view:" + view.toString())); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
index 5934f4e61e..73b05b8080 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
index 80ac708c2b..a8b6c3280c 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
@@ -11,12 +11,12 @@ Export-Package: org.eclipse.emfforms.spi.spreadsheet.core.error.model;version="1
  org.eclipse.emfforms.spi.spreadsheet.core.error.model.util;version="1.0.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.core.databinding.observable.list;version="0.0.0",
  org.eclipse.core.databinding.observable.value;version="0.0.0",
  org.eclipse.core.databinding.property.list;version="0.0.0",
  org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emfforms.internal.core.services.label;version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.10.0,2.0.0)"
+ org.eclipse.emfforms.internal.core.services.label;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.13.0,1.14.0)"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
index a63f0adfc5..3b9a296257 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@ Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.categorizati
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.10.0,2.0.0)"
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.10.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.6.0,2.0.0)",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService.xml
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService.xml
index 3d5ff1673c..1833b6a394 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationElementRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
-    <service>
-        <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
-    </service>
-    <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
-    <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+   </service>
+   <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+   <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService.xml
index 360b542b0b..b392c29b13 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
-    <service>
-        <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
-    </service>
-    <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
-    <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+   </service>
+   <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+   <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService.xml
index ded148bcec..759f13e31d 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategoryRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
-    <service>
-        <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
-    </service>
-    <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
-    <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+   </service>
+   <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+   <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
index 2ce5898d68..8c9499b75c 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@ Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.custom
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService.xml
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService.xml
index f6c73b8c18..953513f083 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/custom/EMFFormsSpreadsheetCustomControlRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService"/>
-    <service>
-        <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
-    </service>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService">
+   <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom.EMFFormsSpreadsheetCustomControlRendererService"/>
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+   </service>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
index d59fc1e909..14d68f52ec 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
@@ -5,17 +5,17 @@ Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.table
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.table;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core.renderer;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emfforms.spreadsheet.core.renderer;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="1.8.0",
  org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
index 271ed98723..0ae7bc66fa 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService.xml
@@ -19,10 +19,10 @@ Import-Package: org.eclipse.core.databinding.observable;version="0.0.0",
  org.eclipse.core.databinding.observable.value;version="0.0.0",
  org.eclipse.emf.databinding;version="0.0.0",
  org.eclipse.emf.ecore.xmi;version="0.0.0",
- org.eclipse.emf.ecp.view.spi.context;version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.spi.context;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="1.6.0",
  org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService.xml
index 3db93c796f..973657dfef 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetContainerRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
-    <service>
-        <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
-    </service>
-    <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
-    <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+   </service>
+   <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+   <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService.xml
index 3d052ad123..6bad6f89be 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetElementRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
-    <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService"/>
-    <service>
-        <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
-    </service>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService">
+   <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService"/>
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+   </service>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService.xml
index 807c37da6c..a89ea1149b 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetViewRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
-    <service>
-        <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
-    </service>
-    <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
-    <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService">
+   <service>
+      <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+   </service>
+   <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+   <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
index 6657f4f320..9eb28f55a3 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
@@ -11,19 +11,19 @@ Export-Package: org.eclipse.emfforms.internal.spreadsheet.core;version="1.0.0";x
  org.eclipse.emfforms.spi.spreadsheet.core;version="1.0.0",
  org.eclipse.emfforms.spi.spreadsheet.core.converter;version="1.0.0",
  org.eclipse.emfforms.spi.spreadsheet.core.transfer;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)",
  org.apache.poi;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.10.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/EMFFormsSpreadsheetFormatDescriptionProviderImpl.xml,
  OSGI-INF/EMFFormsSpreadsheetMultiAttributeConverter.xml,
@@ -35,7 +35,7 @@ Service-Component: OSGI-INF/EMFFormsSpreadsheetFormatDescriptionProviderImpl.xml
  OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.EMFFormsSpreadsheetRendererFactoryImpl.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spi.localization;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="1.6.0",
  org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java
index d8ab49c624..e7a1404873 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java
@@ -23,6 +23,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.DateUtil;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
@@ -233,7 +235,7 @@ public class EMFFormsSpreadsheetSingleAttributeConverter implements EMFFormsSpre
 		} else if (isDate(attributeType.getInstanceClass())) {
 			return DateUtil.getJavaDate(cell.getNumericCellValue());
 		} else if (isXMLDate(attributeType.getInstanceClass())) {
-			return convertCellToXMLDate(cell);
+			return convertCellToXMLDate(cell, isDate(attributeType));
 		} else {
 			if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
 				cell.setCellType(Cell.CELL_TYPE_STRING);
@@ -242,17 +244,36 @@ public class EMFFormsSpreadsheetSingleAttributeConverter implements EMFFormsSpre
 		}
 	}
 
-	private XMLGregorianCalendar convertCellToXMLDate(Cell cell) {
+	private boolean isDate(EDataType attributeType) {
+		final EAnnotation eAnnotation = attributeType
+			.getEAnnotation("http:///org/eclipse/emf/ecore/util/ExtendedMetaData");//$NON-NLS-1$
+		if (eAnnotation == null) {
+			return true;
+		}
+		final EMap<String, String> typeDetails = eAnnotation.getDetails();
+		if (typeDetails.containsKey("name")) {//$NON-NLS-1$
+			return "date".equals(typeDetails.get("name"));//$NON-NLS-1$//$NON-NLS-2$
+		}
+		if (typeDetails.containsKey("baseType")) {//$NON-NLS-1$
+			return typeDetails.get("baseType").endsWith("date");//$NON-NLS-1$//$NON-NLS-2$
+		}
+		return true;
+	}
+
+	private XMLGregorianCalendar convertCellToXMLDate(Cell cell, boolean isDate) {
 		final Calendar targetCal = DateUtil.getJavaCalendarUTC(cell.getNumericCellValue(), false);
 		if (targetCal == null) {
 			return null;
 		}
-		final XMLGregorianCalendar cal = new XMLCalendar(targetCal.getTime(), XMLCalendar.DATE);
-		cal.setTimezone(DatatypeConstants.FIELD_UNDEFINED);
-		cal.setHour(DatatypeConstants.FIELD_UNDEFINED);
-		cal.setMinute(DatatypeConstants.FIELD_UNDEFINED);
-		cal.setSecond(DatatypeConstants.FIELD_UNDEFINED);
-		cal.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		final XMLGregorianCalendar cal = new XMLCalendar(targetCal.getTime(),
+			isDate ? XMLCalendar.DATE : XMLCalendar.DATETIME);
+		if (isDate) {
+			cal.setTimezone(DatatypeConstants.FIELD_UNDEFINED);
+			cal.setHour(DatatypeConstants.FIELD_UNDEFINED);
+			cal.setMinute(DatatypeConstants.FIELD_UNDEFINED);
+			cal.setSecond(DatatypeConstants.FIELD_UNDEFINED);
+			cal.setMillisecond(DatatypeConstants.FIELD_UNDEFINED);
+		}
 		return cal;
 	}
 
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/transfer/EMFFormsSpreadsheetImporterImpl.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/transfer/EMFFormsSpreadsheetImporterImpl.java
index a91bb01cbc..b875a481a3 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/transfer/EMFFormsSpreadsheetImporterImpl.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/transfer/EMFFormsSpreadsheetImporterImpl.java
@@ -148,7 +148,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 				resolveDMR(dmr, eObject);
 			} catch (final EMFFormsExpandingFailedException ex) {
 				errorReports.reportError(
-					Severity.ERROR, LocalizationServiceHelper.getString(getClass(), "ImportError_DMRResolvementFailed"), //$NON-NLS-1$
+					Severity.ERROR, LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+						"ImportError_DMRResolvementFailed"), //$NON-NLS-1$
 					ErrorFactory.eINSTANCE.createEMFLocation(eObject,
 						ErrorFactory.eINSTANCE.createDMRLocation(dmr)),
 					ErrorFactory.eINSTANCE.createSheetLocation(sheetname, columnId, 0,
@@ -163,7 +164,7 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 			} catch (final DatabindingFailedException ex) {
 				errorReports.reportError(
 					Severity.ERROR,
-					LocalizationServiceHelper.getString(getClass(),
+					LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
 						MessageFormat.format("ImportError_DatabindingFailed", ex.getMessage())), //$NON-NLS-1$
 					ErrorFactory.eINSTANCE.createEMFLocation(eObject,
 						ErrorFactory.eINSTANCE.createDMRLocation(dmr)),
@@ -179,7 +180,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 					converterMap.put(dmr, converter);
 				} catch (final EMFFormsConverterException ex) {
 					errorReports.reportError(
-						Severity.ERROR, LocalizationServiceHelper.getString(getClass(), "ImportError_NoValueConverter"), //$NON-NLS-1$
+						Severity.ERROR, LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_NoValueConverter"), //$NON-NLS-1$
 						ErrorFactory.eINSTANCE.createEMFLocation(eObject,
 							ErrorFactory.eINSTANCE.createDMRLocation(dmr)),
 						ErrorFactory.eINSTANCE.createSheetLocation(sheetname, columnId, 0,
@@ -217,7 +219,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 				errorReports.reportError(
 					Severity.ERROR,
 					MessageFormat.format(
-						LocalizationServiceHelper.getString(getClass(), "ImportError_ValueConversionFailed"), //$NON-NLS-1$
+						LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_ValueConversionFailed"), //$NON-NLS-1$
 						ex.getMessage()),
 					ErrorFactory.eINSTANCE.createEMFLocation(eObject,
 						createSettingLocation(setting),
@@ -232,7 +235,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 				if (!checkTypes(feature, convertedValue)) {
 					errorReports.reportError(
 						Severity.ERROR,
-						LocalizationServiceHelper.getString(getClass(), "ImportError_InvalidType"), //$NON-NLS-1$
+						LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_InvalidType"), //$NON-NLS-1$
 						ErrorFactory.eINSTANCE.createEMFLocation(eObject,
 							createSettingLocation(setting),
 							ErrorFactory.eINSTANCE.createDMRLocation(dmr)),
@@ -262,7 +266,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 		/* get dmr comment */
 		if (cell == null) {
 			errorReports.reportError(
-				Severity.ERROR, LocalizationServiceHelper.getString(getClass(), "ImportError_LabelCellDeleted"), //$NON-NLS-1$
+				Severity.ERROR, LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+					"ImportError_LabelCellDeleted"), //$NON-NLS-1$
 				ErrorFactory.eINSTANCE.createEMFLocation(eObject),
 				ErrorFactory.eINSTANCE.createSheetLocation(sheetname, columnId, 0, "NO CELL")); //$NON-NLS-1$
 			return null;
@@ -270,7 +275,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 		final Comment cellComment = cell.getCellComment();
 		if (cellComment == null) {
 			errorReports.reportError(
-				Severity.ERROR, LocalizationServiceHelper.getString(getClass(), "ImportError_CommentDeleted"), //$NON-NLS-1$
+				Severity.ERROR, LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+					"ImportError_CommentDeleted"), //$NON-NLS-1$
 				ErrorFactory.eINSTANCE.createEMFLocation(eObject),
 				ErrorFactory.eINSTANCE.createSheetLocation(sheetname, columnId, 0,
 					getStringCellValue(cell, errorReports, sheetname, columnId)));
@@ -279,7 +285,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 		final String serializedDMR = cellComment.getString().getString();
 		if (serializedDMR == null || serializedDMR.isEmpty()) {
 			errorReports.reportError(
-				Severity.ERROR, LocalizationServiceHelper.getString(getClass(), "ImportError_CommentEmpty"), //$NON-NLS-1$
+				Severity.ERROR,
+				LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class, "ImportError_CommentEmpty"), //$NON-NLS-1$
 				ErrorFactory.eINSTANCE.createEMFLocation(eObject),
 				ErrorFactory.eINSTANCE.createSheetLocation(sheetname, columnId, 0,
 					getStringCellValue(cell, errorReports, sheetname, columnId)));
@@ -293,7 +300,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 		} catch (final IOException ex1) {
 			errorReports.reportError(
 				Severity.ERROR,
-				LocalizationServiceHelper.getString(getClass(), "ImportError_DMRDeserializationFailed"), //$NON-NLS-1$
+				LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+					"ImportError_DMRDeserializationFailed"), //$NON-NLS-1$
 				ErrorFactory.eINSTANCE.createEMFLocation(eObject),
 				ErrorFactory.eINSTANCE.createSheetLocation(sheetname, columnId, 0,
 					getStringCellValue(cell, errorReports, sheetname, columnId)));
@@ -379,7 +387,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 			if (labelRow == null) {
 				errorReports.reportError(
 					Severity.ERROR, MessageFormat.format(
-						LocalizationServiceHelper.getString(getClass(), "ImportError_SheetEmpty"), //$NON-NLS-1$
+						LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_SheetEmpty"), //$NON-NLS-1$
 						sheet.getSheetName()),
 					ErrorFactory.eINSTANCE.createSheetLocation(workbook.getSheetName(sheetId), 0, 0, "NO CELL")); //$NON-NLS-1$
 				continue;
@@ -396,7 +405,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 				/* ID Column is missing. We have to ignore this sheet */
 				errorReports.reportError(
 					Severity.ERROR, MessageFormat.format(
-						LocalizationServiceHelper.getString(getClass(), "ImportError_FirstColumnWrong"), //$NON-NLS-1$
+						LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_FirstColumnWrong"), //$NON-NLS-1$
 						EMFFormsIdProvider.ID_COLUMN, idColumnLabel),
 					ErrorFactory.eINSTANCE.createSheetLocation(workbook.getSheetName(sheetId), 0, 0, "NO CELL")); //$NON-NLS-1$
 				continue;
@@ -405,7 +415,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 				final Row row = sheet.getRow(rowId);
 				if (row == null || isRowEmpty(row)) {
 					errorReports.reportError(
-						Severity.INFO, LocalizationServiceHelper.getString(getClass(), "ImportError_EmptyRow"), //$NON-NLS-1$
+						Severity.INFO, LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_EmptyRow"), //$NON-NLS-1$
 						ErrorFactory.eINSTANCE.createSheetLocation(workbook.getSheetName(sheetId), 0, rowId,
 							EMFFormsIdProvider.ID_COLUMN));
 					continue;
@@ -415,7 +426,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 				if (eObjectId == null || eObjectId.isEmpty()) {
 					/* EObject id deleted */
 					errorReports.reportError(
-						Severity.ERROR, LocalizationServiceHelper.getString(getClass(), "ImportError_NoEObjectID"), //$NON-NLS-1$
+						Severity.ERROR, LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_NoEObjectID"), //$NON-NLS-1$
 						ErrorFactory.eINSTANCE.createSheetLocation(workbook.getSheetName(sheetId), 0, rowId,
 							EMFFormsIdProvider.ID_COLUMN));
 					continue;
@@ -428,7 +440,8 @@ public class EMFFormsSpreadsheetImporterImpl implements EMFFormsSpreadsheetImpor
 					/* duplicate EObject ID */
 					errorReports.reportError(
 						Severity.ERROR,
-						LocalizationServiceHelper.getString(getClass(), "ImportError_DuplicateEObjectID"), //$NON-NLS-1$
+						LocalizationServiceHelper.getString(EMFFormsSpreadsheetImporterImpl.class,
+							"ImportError_DuplicateEObjectID"), //$NON-NLS-1$
 						ErrorFactory.eINSTANCE.createSheetLocation(workbook.getSheetName(sheetId), 0, rowId,
 							EMFFormsIdProvider.ID_COLUMN));
 					continue;
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
index 678d0cb922..95eb505fa5 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.file;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.internal.spreadsheet.file.messages;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.spi.spreadsheet.file;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.osgi.util;version="1.1.0",
  org.osgi.framework;version="[1.2.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
index 0dd15725ee..156f96255f 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@ Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.stream;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.internal.spreadsheet.stream.messages;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.spi.spreadsheet.stream;version="1.0.0"
-Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)"
+Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.osgi.util;version="1.1.0",
  org.osgi.framework;version="[1.3.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
index 68f0686572..129a62e0de 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample Application e3
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e3;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Framework
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product
index 1098a64304..08469803db 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product
@@ -123,6 +123,7 @@
       <plugin id="org.eclipse.emf.edit"/>
       <plugin id="org.eclipse.emf.edit.ui"/>
       <plugin id="org.eclipse.emfforms.common"/>
+      <plugin id="org.eclipse.emfforms.common.validation"/>
       <plugin id="org.eclipse.emfforms.core.services"/>
       <plugin id="org.eclipse.emfforms.core.services.databinding.featurepath"/>
       <plugin id="org.eclipse.emfforms.core.services.domainexpander.default"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
index 2d976a46b7..126878dd37 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
index 6200914954..24dbcda171 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample Application e4
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e4;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.13.0";x-internal:=true
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="[3.9.100,4.0.0)",
  org.eclipse.swt;bundle-version="[3.102.1,4.0.0)",
- org.eclipse.e4.ui.model.workbench;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.e4.ui.model.workbench;bundle-version="[1.0.1,3.0.0)",
  org.eclipse.jface;bundle-version="[3.9.1,4.0.0)",
  org.eclipse.e4.ui.services;bundle-version="[1.0.1,2.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[1.0.2,2.0.0)",
@@ -16,9 +16,9 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.e4.ui.di;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.1,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.annotation;version="1.0.0"
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product
index e4176483e4..34dd59e584 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product
@@ -122,6 +122,7 @@
       <plugin id="org.eclipse.emf.edit"/>
       <plugin id="org.eclipse.emf.edit.ui"/>
       <plugin id="org.eclipse.emfforms.common"/>
+      <plugin id="org.eclipse.emfforms.common.validation"/>
       <plugin id="org.eclipse.emfforms.core.services"/>
       <plugin id="org.eclipse.emfforms.core.services.databinding.featurepath"/>
       <plugin id="org.eclipse.emfforms.core.services.domainexpander.default"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
index 037a9d6f97..1066db256a 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.fx/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.fx/META-INF/MANIFEST.MF
index d44e1fc8ba..b4199a4740 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.fx/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.fx/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.fx.osgi.util;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.fx.core.databinding;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.fx.ui.databinding;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.app;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
index 86412a223a..52890975f6 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample J2ee RAP
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee;version="1.4.0";x-internal:=true
 Require-Bundle: org.eclipse.rap.rwt;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.rap.jface;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.rap.jface.databinding;bundle-version="[2.0.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/makeithappenApplicationConfiguration.xml
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/MakeItHappen Sample J2EE RAP Application.launch b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/MakeItHappen Sample J2EE RAP Application.launch
index c95b13507b..988a73dee9 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/MakeItHappen Sample J2EE RAP Application.launch
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/MakeItHappen Sample J2EE RAP Application.launch
@@ -32,7 +32,7 @@
 <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu.base@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.rap.util@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.view.context.locale@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.group.ui.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default,org.eclipse.emf.ecp.view.label.model.edit@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.label.rap@default:default,org.eclipse.emf.ecp.view.label.ui.swt@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.rule.model.edit@default:default,org.eclipse.emf.ecp.view.rule.model@default:default,org.eclipse.emf.ecp.view.rule@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.unset@default:default,org.eclipse.emf.ecp.view.util.swt.rap@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model.edit@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.ecp.view.vertical.ui.swt@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.rap.edit.ui.minimal@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di.extension@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.plugin@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default,org.eclipse.emfforms.view.model.localization@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default"/>
+<stringAttribute key="target_bundles" value="com.ibm.icu.base@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.rap.util@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.view.context.locale@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.group.ui.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default,org.eclipse.emf.ecp.view.label.model.edit@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.label.rap@default:default,org.eclipse.emf.ecp.view.label.ui.swt@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.rule.model.edit@default:default,org.eclipse.emf.ecp.view.rule.model@default:default,org.eclipse.emf.ecp.view.rule@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.unset@default:default,org.eclipse.emf.ecp.view.util.swt.rap@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model.edit@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.ecp.view.vertical.ui.swt@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.rap.edit.ui.minimal@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di.extension@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.plugin@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default,org.eclipse.emfforms.view.model.localization@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
index e04fc52f14..63e0d7c562 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
@@ -5,7 +5,7 @@
 <unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_112"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_113"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
index 0c1c74bfe1..2f22998cf3 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
index 02de97032f..09a369e860 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MakeItHappen Sample RAP Application
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Framework
 Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.rap;version="1.0.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.rap.ui.workbench;bundle-version="[2.3.0,4.0.0)",
  org.eclipse.rap.jface;bundle-version="[2.3.0,4.0.0)",
  org.eclipse.rap.ui;bundle-version="[2.3.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/MakeItHappen Sample RAP Application.launch b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/MakeItHappen Sample RAP Application.launch
index 0b6e9065f9..81f9b2569b 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/MakeItHappen Sample RAP Application.launch
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/MakeItHappen Sample RAP Application.launch
@@ -32,7 +32,7 @@
 <booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.ibm.icu.base@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.rap.util@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.view.context.locale@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.group.model.edit@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.group.ui.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model.edit@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default,org.eclipse.emf.ecp.view.label.model.edit@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.label.rap@default:default,org.eclipse.emf.ecp.view.label.ui.swt@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model.edit@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.unset@default:default,org.eclipse.emf.ecp.view.util.swt.rap@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model.edit@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.ecp.view.vertical.ui.swt@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.rap.common.ui@default:default,org.eclipse.emf.rap.edit.ui.minimal@default:default,org.eclipse.emf.rap.edit.ui@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di.extension@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.plugin@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default,org.eclipse.emfforms.view.model.localization@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
+<stringAttribute key="target_bundles" value="com.ibm.icu.base@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.rap.util@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.view.context.locale@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.group.model.edit@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.group.ui.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model.edit@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default,org.eclipse.emf.ecp.view.label.model.edit@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.label.rap@default:default,org.eclipse.emf.ecp.view.label.ui.swt@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model.edit@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.unset@default:default,org.eclipse.emf.ecp.view.util.swt.rap@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model.edit@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.ecp.view.vertical.ui.swt@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.rap.common.ui@default:default,org.eclipse.emf.rap.edit.ui.minimal@default:default,org.eclipse.emf.rap.edit.ui@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di.extension@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.plugin@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default,org.eclipse.emfforms.view.model.localization@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.http.servletbridge@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.rap.jface.databinding@default:default,org.eclipse.rap.jface@default:default,org.eclipse.rap.rwt.osgi@default:default,org.eclipse.rap.rwt@default:default,org.eclipse.rap.ui.views@default:default,org.eclipse.rap.ui.workbench@default:default,org.eclipse.rap.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
index e04fc52f14..63e0d7c562 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
@@ -5,7 +5,7 @@
 <unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_112"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_113"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
index 48d6886c57..7060307621 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
index f3a146c9a0..60ab3850d7 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.makeithappen.feature"
       label="EMF Forms MakeItHappen Example (Target Feature)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.makeithappen.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
index 4ff0e59f8f..5118cb05e4 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-examples-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.makeithappen.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
index 32c754ea7c..13e1c663fe 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.makeithappen.model.task.provider.TaskEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
index 52e444b19b..225246c205 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
index dd0732f338..5d032ffbe4 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.emf.ecp.makeithappen.model.viewmodel
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.viewmodel;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
index e1c20dcae7..f309485386 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-examples-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
   </parent>
 
@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>
 
   <groupId>org.eclipse.emf.ecp</groupId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
index 49bff3c3e5..104deeb45b 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.12.0",
- org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.12.0",
- org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.13.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.13.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
index 529ae04452..0fa41834ba 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
index b335d87a4c..862888cde9 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EmailControl
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.email.renderer;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
index 052823c24d..8886dd782b 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
index cf7cca9d99..ee035ec980 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Expandbar Group Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.group.renderer;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: lib/org.eclipse.nebula.widgets.pgroup_1.0.0.201310241250.jar,
  .
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.12.0",
+Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.13.0",
  org.eclipse.nebula.widgets.pgroup;version="1.0.0",
  org.eclipse.nebula.widgets.pgroup.internal;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Service-Component: OSGI-INF/pGroupRendererService.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.events;version="0.0.0",
  org.eclipse.swt.graphics;version="0.0.0",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
index 6547957e35..d711a93610 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
@@ -7,7 +7,7 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-examples-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

   </parent>

 

@@ -15,5 +15,5 @@
   <packaging>eclipse-plugin</packaging>

 

   <groupId>org.eclipse.emf.ecp</groupId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
index ff0870ec86..471a5075db 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Make It Happen Examples
 Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.wizards;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.makeithappen.internal.wizards.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
index f032a76a13..8bdab461c5 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
@@ -6,7 +6,7 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-examples-parent</artifactId>

-		<version>1.12.0-SNAPSHOT</version>

+		<version>1.13.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>

 	</parent>

 

@@ -14,7 +14,7 @@
 	<packaging>eclipse-plugin</packaging>

 

 	<groupId>org.eclipse.emf.ecp</groupId>

-	<version>1.12.0-SNAPSHOT</version>

+	<version>1.13.0-SNAPSHOT</version>

 	<build>

 		<plugins>

 			<plugin>

diff --git a/features/org.eclipse.emf.ecp.all.feature/.project b/features/org.eclipse.emf.ecp.all.feature/.project
new file mode 100644
index 0000000000..395f41927d
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.all.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.ecp.nosite.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
index f017eeb29d..151c4478d6 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
@@ -12,12 +12,12 @@
 <feature
       id="org.eclipse.emf.ecp.cdo.feature"
       label="ECP CDO Integration (Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.cdo.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       Integration of the CDO model repository.
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/pom.xml b/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
index 6739f7ba5b..ab4105681c 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.cdo.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml b/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
index c712e57d01..ed246d6bf5 100644
--- a/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.changebroker.feature"
       label="ECP Change Broker Feature (do not install into IDE)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.changebroker"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       Generic Observer Bus for EMF Notifications including an ECP/EMFStore-Bridge.
diff --git a/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml b/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
index 48faef1336..53caba05b1 100644
--- a/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.changebroker.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
index fdcd5503ea..3df3117229 100644
--- a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.demo.e3.feature"
       label="ECP e3 Demo Application"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.application.e3"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml b/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
index c79841aad6..eaa29fd1c7 100644
--- a/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.demo.e3.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
index c5047bbd13..ae796d7921 100644
--- a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.demo.e4.feature"
       label="ECP e4 Demo Application"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.application.e4"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
index a21de47e32..af95d473c3 100644
--- a/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.demo.e4.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<build>
diff --git a/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml b/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
index 95f6b96d80..fb8091c090 100644
--- a/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature

       id="org.eclipse.emf.ecp.diffmerge.feature"

       label="DiffMerge Feature"

-      version="1.12.0.qualifier"

+      version="1.13.0.qualifier"

       provider-name="Eclipse Modeling Project"

       plugin="org.eclipse.emf.ecp.diffmerge.context"

       image="eclipse_update_120.jpg"

       license-feature="org.eclipse.emf.ecp.license.feature"

-      license-feature-version="1.12.0.qualifier">

+      license-feature-version="1.13.0.qualifier">

 

    <description>

       %description

diff --git a/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml b/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
index 75aaa15e5e..3e5758bf64 100644
--- a/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.diffmerge.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
index c5cfcd61a4..2a80390dbd 100644
--- a/features/org.eclipse.emf.ecp.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.e3.feature"
       label="ECP 3.x UI Integration"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.ui.e3"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       Integration of the EMF Client Platform UI into the Eclipse 3.x workbench, including views and perspectives.
diff --git a/features/org.eclipse.emf.ecp.e3.feature/pom.xml b/features/org.eclipse.emf.ecp.e3.feature/pom.xml
index 28420dcc5e..bd76c27beb 100644
--- a/features/org.eclipse.emf.ecp.e3.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.e3.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.e3.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.e4.feature/feature.xml
index 784f86763c..73397da504 100644
--- a/features/org.eclipse.emf.ecp.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.e4.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.e4.feature"
       label="ECP e4 UI Integration"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.ui.e4"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.e4.feature/pom.xml
index 1667869956..b1962b0537 100644
--- a/features/org.eclipse.emf.ecp.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.e4.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.e4.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml b/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
index 3dc64275e9..7a41d04c2a 100644
--- a/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature

       id="org.eclipse.emf.ecp.ecore.editor.feature"

       label="Ecore Editor Wizard Feature"

-      version="1.12.0.qualifier"

+      version="1.13.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.ecp.ecore.editor.ui"

       license-feature="org.eclipse.emf.ecp.license.feature"

-      license-feature-version="1.12.0.qualifier">

+      license-feature-version="1.13.0.qualifier">

 

    <description>

       %description

diff --git a/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml b/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
index c0d02e347a..6580dba467 100644
--- a/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-features-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor.feature</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/features/org.eclipse.emf.ecp.ecore.feature/feature.xml b/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
index 2380228f1f..a6509fe947 100644
--- a/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.ecore.feature"
       label="EMF Forms Ecore Model Controls"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.edit.ecore.swt"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.ecore.feature/pom.xml b/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
index afbbed5147..a51c572893 100644
--- a/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.ecore.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
index 234accfce9..25028d8efa 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
@@ -5,7 +5,7 @@
       version="1.0.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml b/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
index 458b8b7cf6..b07c021713 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
index 44640b1c19..4a198cb9cd 100644
--- a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.emfforms.idetooling.feature"
       label="EMF Forms IDE Tooling"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
index 4f66e1b69a..85540b6015 100644
--- a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfforms.idetooling.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
index 319f924999..bab69d793c 100644
--- a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.emfforms.runtime.feature"
       label="EMF Forms Runtime"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
index 3babe2d940..6e2a5a3e78 100644
--- a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.emfforms.runtime.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
index c31d514ba3..b9db9679ec 100644
--- a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.emfforms.sdk.feature"
       label="EMF Forms SDK"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
index bc8dbed441..cb4d893070 100644
--- a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.emfforms.sdk.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
index 60d2e068ab..f4da7c9afc 100644
--- a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.emfstore.feature"
       label="ECP EMFStore Integration"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.emfstore.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml b/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
index d9df0bb57f..e4c1c173ec 100644
--- a/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.emfstore.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
index 197ab71f68..bba33c0e72 100644
--- a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.examplemodel.ui.feature"
       label="Example Model UI Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.examplemodel.ui"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
index 481867774a..ffd17c3dd0 100644
--- a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.examplemodel.ui.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   	<build>
diff --git a/features/org.eclipse.emf.ecp.feature/feature.xml b/features/org.eclipse.emf.ecp.feature/feature.xml
index 1e888662bf..00f1836930 100644
--- a/features/org.eclipse.emf.ecp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.feature/feature.xml
@@ -12,12 +12,12 @@
 <feature
       id="org.eclipse.emf.ecp.feature"
       label="ECP Core"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       The core platform containing the model workspace, the navigator, the editor and the repository browser.
diff --git a/features/org.eclipse.emf.ecp.feature/pom.xml b/features/org.eclipse.emf.ecp.feature/pom.xml
index c5e2009659..3878babaad 100644
--- a/features/org.eclipse.emf.ecp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.license.feature/feature.xml b/features/org.eclipse.emf.ecp.license.feature/feature.xml
index c662401933..4703179212 100644
--- a/features/org.eclipse.emf.ecp.license.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.license.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.emf.ecp.license.feature"

       label="EMF Client Platform License"

-      version="1.12.0.qualifier"

+      version="1.13.0.qualifier"

       provider-name="Eclipse Modeling Project"

       image="eclipse_update_120.jpg">

 

diff --git a/features/org.eclipse.emf.ecp.license.feature/pom.xml b/features/org.eclipse.emf.ecp.license.feature/pom.xml
index 6be13a2fdf..51a3f23ae0 100644
--- a/features/org.eclipse.emf.ecp.license.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.license.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.license.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.rap.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
index c4b974e7d2..c0620c59af 100644
--- a/features/org.eclipse.emf.ecp.rap.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.rap.feature"
       label="ECP RAP Demo Application (Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.rap"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.rap.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.feature/pom.xml
index 1bfc17f365..ff06d106a8 100644
--- a/features/org.eclipse.emf.ecp.rap.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
index 1b1cc7552e..80090ad2f5 100644
--- a/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.rap.sdk.feature"
       label="ECP RAP SDK (Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
index 8c539efd8b..f393415721 100644
--- a/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.rap.sdk.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
index abe7164555..a696e3780e 100644
--- a/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.rap.util.feature"
       label="ECP RAP UI Integration"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.rap.util"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
index 3940f71a6f..e8b2ecb549 100644
--- a/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.util.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
index 6c5385181b..4858b89629 100644
--- a/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.sdk.e4.feature"
       label="ECP SDK e4 (Target Feature)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
index c86ed67ddf..ccb7e8f8a1 100644
--- a/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.sdk.e4.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
index 8a316eb0cf..6b21edff77 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.sdk.feature"
       label="ECP SDK 3.x"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
index 537b81a9b1..efc259a1cd 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.sdk.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	
 	<build>
diff --git a/features/org.eclipse.emf.ecp.target.feature/feature.xml b/features/org.eclipse.emf.ecp.target.feature/feature.xml
index 7a3ffb274f..7e0f373206 100644
--- a/features/org.eclipse.emf.ecp.target.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.emf.ecp.target.feature"
       label="ECP Target Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       The target platform feature for the EMF Client Platform, for developer use only.
diff --git a/features/org.eclipse.emf.ecp.target.feature/pom.xml b/features/org.eclipse.emf.ecp.target.feature/pom.xml
index aba9c94094..21059aeb11 100644
--- a/features/org.eclipse.emf.ecp.target.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.target.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 	<build>
diff --git a/features/org.eclipse.emf.ecp.transaction.feature/feature.xml b/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
index c01414a94c..17f5e85cfc 100644
--- a/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.transaction.feature"
       label="ECP Transactional Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.ui.transaction"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.transaction.feature/pom.xml b/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
index c8e3f9f2bb..849ef800eb 100644
--- a/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-features-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.transaction.feature</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-feature</packaging>

 </project>

diff --git a/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml b/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
index cf549e46ce..f68be73c49 100644
--- a/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.validation.view.feature"
       label="ECP Validation View (Highly Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.ui.validation"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml b/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
index c5d5c61dc4..086133c670 100644
--- a/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.validation.view.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml b/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
index 7ce758bb32..3af05d5b14 100644
--- a/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.categorization.feature"
       label="EMF Forms Categorization Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.categorization.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml b/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
index 0d6e7e86b0..5d55d20b95 100644
--- a/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.categorization.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
index f5d0575886..df58da4899 100644
--- a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.compoundcontrol.feature"
       label="EMF Forms Compound Control Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.compoundcontrol.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
index 39e7cc1fd1..e74db364e2 100644
--- a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml b/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
index 2fd8cdcc60..ab8ef3d6c5 100644
--- a/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.custom.feature"
       label="EMF Forms Custom Control Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.custom.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml b/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
index 90b87376de..685b0818e5 100644
--- a/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.custom.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.di.feature/feature.xml b/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
index 161ef80de2..660ef79d10 100644
--- a/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.di.feature"
       label="EMFForms Dependency Injection Feature (Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.model.common.di"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.di.feature/pom.xml b/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
index f3e043cfc4..3cdd5b3c2c 100644
--- a/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
 
diff --git a/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml b/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
index d82c6ea2dd..127ce6b28c 100644
--- a/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.edapt.feature"
       label="EMF Forms IDE Tooling Edapt View Model Migration Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.edapt"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml b/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
index 12d6cc5c77..29a36b8042 100644
--- a/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.edapt.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
   	<build>
diff --git a/features/org.eclipse.emf.ecp.view.group.feature/feature.xml b/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
index 491154dfb2..15b5847ad6 100644
--- a/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.group.feature"
       label="EMF Forms Group Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.group.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.group.feature/pom.xml b/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
index 909c37d2f1..b804d9e461 100644
--- a/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.group.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
index 06a85daeb8..567c957779 100644
--- a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature"
       label="EMFForms Collapsible Group Renderer using Nebula PGroup"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
index 16954e9f51..d02202716f 100644
--- a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
index e3a7fb28cc..e8ee77e0cd 100644
--- a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.groupedgrid.feature"
       label="EMF Forms Grouped Grid Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.groupedgrid.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
index 39ab0cac6a..196d90c45d 100644
--- a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.groupedgrid.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml b/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
index 4c7386abd2..8f7c588fc9 100644
--- a/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.horizontal.feature"
       label="EMF Forms Horizontal Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.horizontal.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml b/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
index ee8d5fc288..345dd79ebd 100644
--- a/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.horizontal.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
index 914482bef3..8035283b12 100644
--- a/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature

       id="org.eclipse.emf.ecp.view.indexdmr.feature"

       label="EMFForms Index DMR Feature"

-      version="1.12.0.qualifier"

+      version="1.13.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.ecp.view.indexdmr.model"

       image="eclipse_update_120.jpg"

       license-feature="org.eclipse.emf.ecp.license.feature"

-      license-feature-version="1.12.0.qualifier">

+      license-feature-version="1.13.0.qualifier">

 

    <description>

       %description

diff --git a/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
index b0c7832e84..a2143705c1 100644
--- a/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.indexdmr.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
index 0d18ff6619..0f322e2057 100644
--- a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.keyattributedmr.feature"
       label="Key Attribute DMR Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.keyattributedmr.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
index 5032fb5f30..8cd90eddbd 100644
--- a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.keyattributedmr.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.label.feature/feature.xml b/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
index 68e52bfdb6..4b42f1a1a4 100644
--- a/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.label.feature"
       label="EMF Forms Label Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.label.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.label.feature/pom.xml b/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
index 17fea709a2..4c80e994b9 100644
--- a/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.label.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
index e1ec8cf0dc..ba3438e4b0 100644
--- a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature

       id="org.eclipse.emf.ecp.view.mappingdmr.feature"

       label="Mapping DMR Feature"

-      version="1.12.0.qualifier"

+      version="1.13.0.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.emf.ecp.view.mappingdmr.model"

       image="eclipse_update_120.jpg"

       license-feature="org.eclipse.emf.ecp.license.feature"

-      license-feature-version="1.12.0.qualifier">

+      license-feature-version="1.13.0.qualifier">

 

    <description>

       %description

diff --git a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
index 17f212dfa5..e56dd06ad2 100644
--- a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.mappingdmr.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
index e788fc1a42..dabc8856be 100644
--- a/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.model.controls.feature"
       label="EMF Forms View Model Controls"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.ui.view.editor.controls"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
index 83ef99d250..1a9e01c170 100644
--- a/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.controls.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
index 870e0b63ce..97c568fc80 100644
--- a/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.model.editor.feature"
       label="EMF Forms View Model Wizard"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.model.editor"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
index 090e93abbf..1fcbae6096 100644
--- a/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.editor.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.model.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
index 5e20d49042..10a6d1f04a 100644
--- a/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature

       id="org.eclipse.emf.ecp.viewmodel.feature"

       label="EMF Forms Core Model"

-      version="1.12.0.qualifier"

+      version="1.13.0.qualifier"

       provider-name="Eclipse Modeling Project"

       plugin="org.eclipse.emf.ecp.view.model"

       image="eclipse_update_120.jpg"

       license-feature="org.eclipse.emf.ecp.license.feature"

-      license-feature-version="1.12.0.qualifier">

+      license-feature-version="1.13.0.qualifier">

 

    <description>

       %description

diff --git a/features/org.eclipse.emf.ecp.view.model.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
index 750ed13d12..a16afe4ab9 100644
--- a/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.viewmodel.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml b/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
index a113affe60..59cec17cce 100644
--- a/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.rule.feature"
       label="EMF Forms Rule Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.rule"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml b/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
index 5958870d1e..ca20c78e5b 100644
--- a/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.rule.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.section.feature/feature.xml b/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
index 17dc59132c..5e725ff82e 100644
--- a/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.section.feature"
       label="EMF Forms Section Model (Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.section.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.section.feature/pom.xml b/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
index 0e1ab04bd9..117806c005 100644
--- a/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.section.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml b/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
index 2b75490a2b..e44348d7bc 100644
--- a/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.stack.feature"
       label="EMF Forms Stack Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.stack.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml b/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
index ef0e486968..1e15464deb 100644
--- a/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.stack.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
     <build>
diff --git a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
index 65b12ca155..f6ec70c83b 100644
--- a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.celleditor.rcp.feature"
       label="EMFForms Table UI SWT Additional Cell Editors (non-RAP)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.table.celleditor.rcp"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
index 919e5f0d92..6acc41c4d1 100644
--- a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.celleditor.rcp.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
index d433613bbf..0af1b7344d 100644
--- a/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.feature"
       label="EMF Forms Table Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.table.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
index f421ba250d..a3c38c3095 100644
--- a/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
index c543593cff..69af1e4646 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature"
       label="EMF Forms Nebula Grid Table UI Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.table.ui.nebula.grid"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
index b74f90c22a..9efca99482 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
index 03edfaad7b..c20cf6af7c 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
@@ -2,9 +2,9 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.ui.rcp.feature"
       label="Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
index bdfa07ba2e..c3bb03cf09 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.rcp.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
index af7f1fe218..dc28469c6d 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature"
       label="EMF Forms Persist Table State Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
index da7e172be3..bdcd8ee2f5 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.template.feature/feature.xml b/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
index c82c140b5b..cd0f35a1af 100644
--- a/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.template.feature"
       label="EMF Forms Template  Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.template.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.template.feature/pom.xml b/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
index c03d2b7373..d7208af873 100644
--- a/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.template.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
index e797ea6d92..efda0ad631 100644
--- a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.treemasterdetail.feature"
       label="EMF Forms Master-Detail Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.treemasterdetail.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
index 4ed97aed29..3bbdfca19a 100644
--- a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml b/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
index e55c05f989..3c500c4e24 100644
--- a/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.unset.feature"
       label="EMF Forms Unset Service"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emf.ecp.view.unset"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml b/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
index c3f20ad9fd..136bafa555 100644
--- a/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.unset.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
index 1e336eeecf..9dfdfa340c 100644
--- a/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.validation.bean.feature"
       label="Bean Validation Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.validation.bean"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
index e2dd170658..2e4b9b748d 100644
--- a/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.bean.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
index fefed85912..cc7fcafd8b 100644
--- a/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.validation.feature"
       label="EMF Forms Validation Service"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.validation"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
@@ -28,4 +28,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.emfforms.common.validation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
index df895ca6ee..76aef7d856 100644
--- a/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
index 4f3331831e..a040107cb3 100644
--- a/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.validation.initial.feature"
       label="ECP Deep Validation Initial Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.validation"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
index a1bfcfcad3..3703baf337 100644
--- a/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.validation.initial.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml b/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
index 64ee952f70..59bf3951da 100644
--- a/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.vertical.feature"
       label="EMF Forms Vertical Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.vertical.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml b/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
index 327485aa45..cec1039cf4 100644
--- a/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.vertical.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml b/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
index 26729d8ca3..b392b09d0d 100644
--- a/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.viewproxy.feature"
       label="EMF Forms View Proxy Model"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.viewproxy.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml b/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
index 759e629c76..e2f8aa805f 100644
--- a/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.viewproxy.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
index 0f278a4f4e..c1e97b1dc0 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
@@ -12,12 +12,12 @@
 <feature
       id="org.eclipse.emf.ecp.workspace.feature"
       label="ECP File Integration (Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.workspace.core"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       Integration for file and Eclipse workspace persistence.
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/pom.xml b/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
index 398e9d6ee3..8f03d56cf1 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.workspace.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/.project b/features/org.eclipse.emfforms.common.prevalidation.feature/.project
new file mode 100644
index 0000000000..ed8d78a08d
--- /dev/null
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emfforms.common.prevalidation.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emfforms.common.prevalidation.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..4824b80263
--- /dev/null
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+encoding/<project>=UTF-8

diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emfforms.common.prevalidation.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000000..c522e1f4ae
--- /dev/null
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+line.separator=\n

diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/build.properties b/features/org.eclipse.emfforms.common.prevalidation.feature/build.properties
new file mode 100644
index 0000000000..b3a611b5c9
--- /dev/null
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/feature.properties b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.properties
new file mode 100644
index 0000000000..391aa74281
--- /dev/null
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.properties
@@ -0,0 +1,7 @@
+# Copyright (c) 2011-2017 EclipseSource Munich GmbH and others.
+# 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
+
+description = Default implementation of the EMF Forms Prevalidation Service.
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
new file mode 100644
index 0000000000..bf8cf84e75
--- /dev/null
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.emfforms.common.prevalidation.feature"
+      label="EMFForms PreValidation Feature"
+      version="1.13.0.qualifier"
+      provider-name="Eclipse Modeling Project"
+      plugin="org.eclipse.emfforms.common.prevalidation"
+      license-feature="org.eclipse.emf.ecp.license.feature"
+      license-feature-version="1.13.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright url="%copyrightURL">
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.emfforms.common.prevalidation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml b/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
new file mode 100644
index 0000000000..a49fa6289a
--- /dev/null
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.emf.ecp</groupId>
+    <artifactId>ecp-features-parent</artifactId>
+    <version>1.13.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
+  </parent>
+  <groupId>org.eclipse.emf.ecp</groupId>
+  <artifactId>org.eclipse.emfforms.common.prevalidation.feature</artifactId>
+  <version>1.13.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.emfforms.editor.feature/feature.xml b/features/org.eclipse.emfforms.editor.feature/feature.xml
index f1ab264bf2..7d517b085a 100644
--- a/features/org.eclipse.emfforms.editor.feature/feature.xml
+++ b/features/org.eclipse.emfforms.editor.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.editor.feature"
       label="EMF Forms Ecore Editor"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emfforms.editor"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.editor.feature/pom.xml b/features/org.eclipse.emfforms.editor.feature/pom.xml
index a45baa7df9..698f15002d 100644
--- a/features/org.eclipse.emfforms.editor.feature/pom.xml
+++ b/features/org.eclipse.emfforms.editor.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
index 98cc65ff2d..06dc80212c 100644
--- a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.editor.genmodel.util.feature"
       label="EMFForms GenModel Editor Util"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.editor.genmodel.util"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
index 45a441cd34..144ce8f1c8 100644
--- a/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.editor.genmodel.util.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
index a61e5640c1..35f0b8ed28 100644
--- a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
+++ b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emfforms.rulerepository.feature"
       label="EMFForms RuleRepository Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.rulerepository.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/pom.xml b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
index 9939cef7e7..e8fb8c4055 100644
--- a/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
+++ b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.rulerepository.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
index 3d4b8a5075..7482520345 100644
--- a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.control.multiattribute.feature"
       label="EMFForms SWT Control for Multi EAttribtues"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.emfforms.swt.control.multiattribute"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
index 33c2f65c49..40241f9689 100644
--- a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.control.multiattribute.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
index 30d122bb73..966256d13d 100644
--- a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.control.text.autocomplete.feature"
       label="EMFForms SWT Text Control with Autocomplete Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.swt.control.text.autocomplete"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
index e9f603a250..d58e343078 100644
--- a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.control.text.autocomplete.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
index 1c5943d11c..f89bd3d1b4 100644
--- a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.control.text.richtext.feature"
       label="EMF Forms Rich Text Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.swt.control.text.richtext"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
index 8f886c77a8..5a45058dbb 100644
--- a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.control.text.richtext.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml b/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
index e6a292e557..f6a7721e2c 100644
--- a/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.swt.controlgrid.feature"
       label="EMFForms Control Grid SWT Feature (Experimental)"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.view.controlgrid.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml b/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
index 60d31d23b2..dce7a84472 100644
--- a/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.swt.controlgrid.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.emfforms.view.annotation.feature/feature.xml b/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
index 64745f0fb7..3f22da8b83 100644
--- a/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
+++ b/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.eclipse.emfforms.view.annotation.feature"
       label="EMFForms Annotation View Model Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emfforms.view.annotation.model"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/features/org.eclipse.emfforms.view.annotation.feature/pom.xml b/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
index 0d5ab0fa03..37468b0a09 100644
--- a/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
+++ b/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emfforms.view.annotation.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml b/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
index e8ca9129c2..605adfc532 100644
--- a/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
+++ b/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
@@ -7,7 +7,7 @@
       plugin="org.eclipse.emfforms.spreadsheet.core"

       image="eclipse_update_120.jpg"

       license-feature="org.eclipse.emf.ecp.license.feature"

-      license-feature-version="1.12.0.qualifier">

+      license-feature-version="1.13.0.qualifier">

 

    <description>

       %description

diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
index ec7335eeed..c263111d64 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="%productName" uid="org.eclipse.emf.ecp.3x" id="org.eclipse.emf.ecp.application.e3.product" application="org.eclipse.emf.ecp.application.e3.application" version="1.12.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="%productName" uid="org.eclipse.emf.ecp.3x" id="org.eclipse.emf.ecp.application.e3.product" application="org.eclipse.emf.ecp.application.e3.application" version="1.13.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/org.eclipse.emf.ecp.application.e3/icons/eclipse_lg.gif"/>
@@ -61,7 +61,6 @@
       <feature id="org.eclipse.emf.emfstore.client.feature"/>
       <feature id="org.eclipse.emf.emfstore.client.ui.feature"/>
       <feature id="org.eclipse.emf.emfstore.common.feature"/>
-      <feature id="org.eclipse.emf.emfstore.ecore.feature"/>
       <feature id="org.eclipse.emf.emfstore.server.feature"/>
       <feature id="org.eclipse.emf.ecp.emfforms.idetooling.feature"/>
    </features>
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
index 36ad21c569..17bd60ba8b 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.application.e4.demo" id="org.eclipse.emf.ecp.application.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.12.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.application.e4.demo" id="org.eclipse.emf.ecp.application.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.13.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/releng/org.eclipse.emf.ecp.products/pom.xml b/releng/org.eclipse.emf.ecp.products/pom.xml
index 58b7b9534a..9a8dd1fa81 100644
--- a/releng/org.eclipse.emf.ecp.products/pom.xml
+++ b/releng/org.eclipse.emf.ecp.products/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.products</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
   
   <build>
diff --git a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
index 66095cf46d..820f7d92e3 100644
--- a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
+++ b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-rap-parent</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<!-- Parent for the rap product. Needed to reduce environments.
diff --git a/releng/org.eclipse.emf.ecp.rap.products/pom.xml b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
index 47c7a24090..2ff8b48b40 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/pom.xml
+++ b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
@@ -5,12 +5,12 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-rap-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../org.eclipse.emf.ecp.rap.parent/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.rap.products</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <properties>
diff --git a/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml b/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
index a529c90361..4343f0b3e2 100644
--- a/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-bundles-parent</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -263,6 +263,8 @@
 		
 		<!-- Core Services -->
 		<module>../../bundles/org.eclipse.emfforms.common</module>
+        <module>../../bundles/org.eclipse.emfforms.common.validation</module>
+        <module>../../bundles/org.eclipse.emfforms.common.prevalidation</module>
 		<module>../../bundles/org.eclipse.emfforms.core.services.databinding.featurepath</module>
 		<module>../../bundles/org.eclipse.emfforms.core.services.databinding.index</module>
 		<module>../../bundles/org.eclipse.emfforms.core.services.databinding.keyattribute</module>
diff --git a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
index e92c8ee282..6ea335f5f9 100644
--- a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-examples-parent</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.features/pom.xml b/releng/org.eclipse.emf.ecp.releng.features/pom.xml
index 5bc219b585..9138f91b09 100644
--- a/releng/org.eclipse.emf.ecp.releng.features/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.features/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-features-parent</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
@@ -39,6 +39,7 @@
 		<module>../../features/org.eclipse.emf.ecp.view.rule.feature</module>
 		<module>../../features/org.eclipse.emf.ecp.view.validation.feature</module>
 		<module>../../features/org.eclipse.emf.ecp.view.validation.bean.feature</module>
+		<module>../../features/org.eclipse.emfforms.common.prevalidation.feature</module>
 		<module>../../features/org.eclipse.emf.ecp.view.unset.feature</module>
 		<module>../../features/org.eclipse.emf.ecp.view.vertical.feature</module>
 		<module>../../features/org.eclipse.emf.ecp.view.horizontal.feature</module>
@@ -103,6 +104,7 @@
 		<module>../../features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature</module>
 		
 		<module>../../features/org.eclipse.emfforms.rulerepository.feature</module>
+		
 	</modules>
 
 	<!-- Parent used for features. This POM contains all build steps for code signing. -->
diff --git a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
index f71f66f480..fe468ec80b 100644
--- a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-tests-parent</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
 	</parent>
 	<profiles>
diff --git a/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml b/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml
index c2006162b4..db686aff6f 100644
--- a/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml
+++ b/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml
@@ -1,223 +1,227 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
 <!--
- This configuration file was written by the eclipse-cs plugin configuration 
-	editor -->
-<!-- Checkstyle-Configuration: ESMStyle Description: none -->
+    This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+    Checkstyle-Configuration: ESMCheckstyle
+    Description: none
+-->
 <module name="Checker">
-	<property name="severity" value="warning"/>
-	<module name="TreeWalker">
-		<property name="tabWidth" value="4"/>
-		<module name="FileContentsHolder"/>
-		<module name="JavadocMethod">
-			<property name="scope" value="package"/>
-		</module>
-		<module name="JavadocType">
-			<property name="allowUnknownTags" value="true"/>
-		</module>
-		<module name="JavadocVariable">
-			<property name="scope" value="package"/>
-		</module>
-		<module name="JavadocStyle"/>
-		<module name="ConstantName"/>
-		<module name="LocalFinalVariableName"/>
-		<module name="LocalVariableName"/>
-		<module name="MemberName"/>
-		<module name="MethodName"/>
-		<module name="PackageName"/>
-		<module name="ParameterName"/>
-		<module name="StaticVariableName"/>
-		<module name="TypeName"/>
-		<module name="AvoidStarImport"/>
-		<module name="IllegalImport"/>
-		<module name="RedundantImport"/>
-		<module name="UnusedImports"/>
-		<module name="LineLength">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="MethodLength"/>
-		<module name="ParameterNumber"/>
-		<module name="EmptyForIteratorPad">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="MethodParamPad">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="NoWhitespaceAfter">
-			<property name="severity" value="ignore"/>
-			<property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="NoWhitespaceBefore">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="OperatorWrap">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="ParenPad">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="TypecastParenPad">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="WhitespaceAfter">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="WhitespaceAround">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="ModifierOrder"/>
-		<module name="RedundantModifier"/>
-		<module name="AvoidNestedBlocks">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="EmptyBlock">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="LeftCurly">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="NeedBraces"/>
-		<module name="RightCurly">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="AvoidInlineConditionals">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="EmptyStatement"/>
-		<module name="EqualsHashCode"/>
-		<module name="HiddenField">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="IllegalInstantiation"/>
-		<module name="InnerAssignment"/>
-		<module name="MagicNumber">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="MissingSwitchDefault"/>
-		<module name="SimplifyBooleanExpression"/>
-		<module name="SimplifyBooleanReturn"/>
-		<module name="DesignForExtension">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="FinalClass"/>
-		<module name="HideUtilityClassConstructor"/>
-		<module name="InterfaceIsType"/>
-		<module name="VisibilityModifier"/>
-		<module name="ArrayTypeStyle"/>
-		<module name="FinalParameters">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="TodoComment">
-			<property name="severity" value="ignore"/>
-			<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-		</module>
-		<module name="UpperEll"/>
-		<module name="BooleanExpressionComplexity">
-			<property name="max" value="5"/>
-		</module>
-		<module name="CyclomaticComplexity">
-			<property name="max" value="15"/>
-		</module>
-		<module name="NPathComplexity">
-			<property name="max" value="220"/>
-		</module>
-		<module name="JavaNCSS"/>
-		<module name="SuperClone"/>
-		<module name="SuperFinalize"/>
-		<module name="PackageDeclaration"/>
-		<module name="NestedIfDepth">
-			<property name="max" value="2"/>
-		</module>
-		<module name="IllegalCatch">
-			<property name="id" value="IllegalExceptionCatch"/>
-		</module>
-		<module name="IllegalThrows">
-			<property name="illegalClassNames" value="java.lang.Throwable, java.lang.Error, java.lang.RuntimeException, java.lang.Exception"/>
-			<property name="ignoredMethodNames" value="finalize, call, start, stop, setUp, tearDown"/>
-		</module>
-		<module name="CovariantEquals"/>
-		<module name="DefaultComesLast"/>
-		<module name="ExplicitInitialization"/>
-		<module name="FallThrough"/>
-		<module name="AnonInnerLength">
-			<property name="max" value="30"/>
-		</module>
-		<module name="ThrowsCount">
-			<property name="max" value="3"/>
-		</module>
-		<module name="UncommentedMain"/>
-		<module name="CyclomaticComplexity">
-			<property name="id" value="complexity"/>
-			<property name="max" value="15"/>
-		</module>
-	</module>
-	<module name="FileLength">
-		<property name="severity" value="info"/>
-	</module>
-	<module name="FileTabCharacter">
-		<property name="severity" value="ignore"/>
-		<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-	</module>
-	<module name="NewlineAtEndOfFile">
-		<property name="severity" value="ignore"/>
-		<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-	</module>
-	<module name="Translation"/>
-	<module name="SuppressionCommentFilter">
-		<property name="offCommentFormat" value="(@generated$)|(// end of custom code$)"/>
-		<property name="onCommentFormat" value="(@generated NOT$)|(// begin of custom code$)"/>
-		<metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Warning suppressed because code is generated by EMF. Warning enabled on custom code"/>
-		<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Supress Warnings on EMF generated code. No Supress Warning on manual code"/>
-	</module>
-	<module name="SuppressionCommentFilter">
-		<property name="offCommentFormat" value="// BEGIN SUPRESS CATCH EXCEPTION"/>
-		<property name="onCommentFormat" value="// END SUPRESS CATCH EXCEPTION"/>
-		<property name="messageFormat" value=".*Exception.*"/>
-		<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="SupressCatchExceptionWarning"/>
-	</module>
-	<module name="SuppressionCommentFilter">
-		<property name="offCommentFormat" value="// BEGIN IGNORE UNNECCESSARY IMPORT"/>
-		<property name="onCommentFormat" value="// END IGNORE UNNECCESSARY IMPORT"/>
-		<property name="messageFormat" value=".*import.*"/>
-		<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Ignore unneccessary import warnings"/>
-	</module>
-	<module name="SuppressionCommentFilter">
-		<property name="offCommentFormat" value="// BEGIN COMPLEX CODE"/>
-		<property name="onCommentFormat" value="// END COMPLEX CODE"/>
-		<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="High Complexity Code Warning Suppression"/>
-	</module>
-	<module name="SuppressionCommentFilter">
-		<property name="offCommentFormat" value="// REUSED CLASS"/>
-		<property name="onCommentFormat" value="// END REUSED CLASS"/>
-		<metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="High Complexity Code Warning Suppression"/>
-	</module>
-	<module name="SuppressionCommentFilter">
-    	<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-    	<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-   		<property name="checkFormat" value="$1"/>
-	</module>
-	<module name="RegexpHeader">
-		<metadata name="net.sf.eclipsecs.core.comment" value="EclipseSource and others"/>
-		<property name="header" value="^\/\*+$\n^ \* Copyright( \(c\))? \d\d\d\d(-\d\d\d\d)? (.*)$\n^ \*(( Technische Universitaet Muenchen\.)|(.*))$\n^ \* All rights reserved\. This program and the accompanying materials$\n^ \* are made available under the terms of the Eclipse Public License v1\.0$\n^ \* which accompanies this distribution\, and is available at$\n^ \* http\:\/\/www\.eclipse\.org\/legal\/epl-v10\.html$\n^ \*.*$\n^ \* Contributors\:.*$\n"/>
-		<property name="fileExtensions" value="java"/>
-	</module>
-</module>
\ No newline at end of file
+  <property name="severity" value="warning"/>
+  <module name="TreeWalker">
+    <property name="tabWidth" value="4"/>
+    <module name="FileContentsHolder"/>
+    <module name="JavadocMethod">
+      <property name="scope" value="package"/>
+    </module>
+    <module name="JavadocType">
+      <property name="allowUnknownTags" value="true"/>
+    </module>
+    <module name="JavadocVariable">
+      <property name="scope" value="package"/>
+    </module>
+    <module name="JavadocStyle"/>
+    <module name="ConstantName"/>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName"/>
+    <module name="MethodName"/>
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="StaticVariableName"/>
+    <module name="TypeName"/>
+    <module name="AvoidStarImport"/>
+    <module name="IllegalImport"/>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    <module name="LineLength">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="MethodLength"/>
+    <module name="ParameterNumber"/>
+    <module name="EmptyForIteratorPad">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="MethodParamPad">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="NoWhitespaceAfter">
+      <property name="severity" value="ignore"/>
+      <property name="tokens" value="BNOT,DEC,DOT,INC,LNOT,UNARY_MINUS,UNARY_PLUS"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="NoWhitespaceBefore">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="OperatorWrap">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="ParenPad">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="TypecastParenPad">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="WhitespaceAfter">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="WhitespaceAround">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="ModifierOrder"/>
+    <module name="RedundantModifier"/>
+    <module name="AvoidNestedBlocks">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="EmptyBlock">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="LeftCurly">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="NeedBraces"/>
+    <module name="RightCurly">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="AvoidInlineConditionals">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="EmptyStatement"/>
+    <module name="EqualsHashCode"/>
+    <module name="HiddenField">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="IllegalInstantiation"/>
+    <module name="InnerAssignment"/>
+    <module name="MagicNumber">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="MissingSwitchDefault"/>
+    <module name="SimplifyBooleanExpression"/>
+    <module name="SimplifyBooleanReturn"/>
+    <module name="DesignForExtension">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor"/>
+    <module name="InterfaceIsType"/>
+    <module name="VisibilityModifier"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="FinalParameters">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="TodoComment">
+      <property name="severity" value="ignore"/>
+      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+    </module>
+    <module name="UpperEll"/>
+    <module name="BooleanExpressionComplexity">
+      <property name="max" value="5"/>
+    </module>
+    <module name="CyclomaticComplexity">
+      <property name="max" value="15"/>
+    </module>
+    <module name="NPathComplexity">
+      <property name="max" value="220"/>
+    </module>
+    <module name="JavaNCSS"/>
+    <module name="SuperClone"/>
+    <module name="SuperFinalize"/>
+    <module name="PackageDeclaration"/>
+    <module name="NestedIfDepth">
+      <property name="max" value="2"/>
+    </module>
+    <module name="IllegalCatch">
+      <property name="id" value="IllegalExceptionCatch"/>
+    </module>
+    <module name="IllegalThrows">
+      <property name="illegalClassNames" value="java.lang.Throwable, java.lang.Error, java.lang.RuntimeException, java.lang.Exception"/>
+      <property name="ignoredMethodNames" value="finalize, call, start, stop, setUp, tearDown"/>
+    </module>
+    <module name="CovariantEquals"/>
+    <module name="DefaultComesLast"/>
+    <module name="ExplicitInitialization"/>
+    <module name="FallThrough"/>
+    <module name="AnonInnerLength">
+      <property name="max" value="30"/>
+    </module>
+    <module name="ThrowsCount">
+      <property name="max" value="3"/>
+    </module>
+    <module name="UncommentedMain"/>
+    <module name="CyclomaticComplexity">
+      <property name="id" value="complexity"/>
+      <property name="max" value="15"/>
+    </module>
+  </module>
+  <module name="FileLength">
+    <property name="severity" value="info"/>
+  </module>
+  <module name="FileTabCharacter">
+    <property name="severity" value="ignore"/>
+    <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+  </module>
+  <module name="NewlineAtEndOfFile">
+    <property name="severity" value="ignore"/>
+    <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+  </module>
+  <module name="Translation"/>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="(@generated$)|(// end of custom code$)"/>
+    <property name="onCommentFormat" value="(@generated NOT$)|(// begin of custom code$)"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Supress Warnings on EMF generated code. No Supress Warning on manual code"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="Warning suppressed because code is generated by EMF. Warning enabled on custom code"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="// BEGIN SUPRESS CATCH EXCEPTION"/>
+    <property name="onCommentFormat" value="// END SUPRESS CATCH EXCEPTION"/>
+    <property name="messageFormat" value=".*Exception.*"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="SupressCatchExceptionWarning"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="// BEGIN IGNORE UNNECCESSARY IMPORT"/>
+    <property name="onCommentFormat" value="// END IGNORE UNNECCESSARY IMPORT"/>
+    <property name="messageFormat" value=".*import.*"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Ignore unneccessary import warnings"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="// BEGIN COMPLEX CODE"/>
+    <property name="onCommentFormat" value="// END COMPLEX CODE"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="High Complexity Code Warning Suppression"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="// REUSED CLASS"/>
+    <property name="onCommentFormat" value="// END REUSED CLASS"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="High Complexity Code Warning Suppression"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+    <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+    <property name="checkFormat" value="$1"/>
+  </module>
+  <module name="RegexpHeader">
+    <metadata name="net.sf.eclipsecs.core.comment" value="EclipseSource and others"/>
+    <property name="header" value="^\/\*+$\n^ \* Copyright( \(c\))? \d\d\d\d(-\d\d\d\d)? (.*)$\n^ \*(( Technische Universitaet Muenchen\.)|(.*))$\n^ \* All rights reserved\. This program and the accompanying materials$\n^ \* are made available under the terms of the Eclipse Public License v1\.0$\n^ \* which accompanies this distribution\, and is available at$\n^ \* http\:\/\/www\.eclipse\.org\/legal\/epl-v10\.html$\n^ \*.*$\n^ \* Contributors\:.*$\n"/>
+    <property name="fileExtensions" value="java"/>
+  </module>
+</module>
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index 8213a8034a..b2192436e7 100644
--- a/releng/org.eclipse.emf.ecp.releng/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng/pom.xml
@@ -5,14 +5,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>ecp-parent</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
 		<tycho-version>0.25.0</tycho-version>
 		<tycho-extras-version>0.25.0</tycho-extras-version>
 		<javadoc-version>2.10.3</javadoc-version>
-		<ecp-version>1.12.0</ecp-version>
+		<ecp-version>1.13.0</ecp-version>
 		<javadoc-title>EMF Client Platform ${ecp-version} API</javadoc-title>
 		<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/releng/org.eclipse.emf.ecp.repository.target/category.xml b/releng/org.eclipse.emf.ecp.repository.target/category.xml
index 59d3d97479..e28c11f178 100644
--- a/releng/org.eclipse.emf.ecp.repository.target/category.xml
+++ b/releng/org.eclipse.emf.ecp.repository.target/category.xml
@@ -36,6 +36,9 @@
    <feature id="org.eclipse.emf.ecp.view.validation.feature.source" version="0.0.0">
       <category name="org.eclipse.emf.ecp.emfforms"/>
    </feature>
+   <feature id="org.eclipse.emfforms.common.prevalidation.feature.source" version="0.0.0">
+      <category name="org.eclipse.emf.ecp.emfforms"/>
+   </feature>
    <feature id="org.eclipse.emf.ecp.view.horizontal.feature.source" version="0.0.0">
       <category name="org.eclipse.emf.ecp.view"/>
    </feature>
diff --git a/releng/org.eclipse.emf.ecp.repository.target/pom.xml b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
index 487191b3b7..330e099503 100644
--- a/releng/org.eclipse.emf.ecp.repository.target/pom.xml
+++ b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.site.target.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	
 	<!-- see http://www.codetrails.com/blog/maven-tycho-how-to-configure-your-repos-mirror-and-statistics-uris -->
diff --git a/releng/org.eclipse.emf.ecp.repository/category.xml b/releng/org.eclipse.emf.ecp.repository/category.xml
index af4454109b..5088257560 100644
--- a/releng/org.eclipse.emf.ecp.repository/category.xml
+++ b/releng/org.eclipse.emf.ecp.repository/category.xml
@@ -174,6 +174,9 @@
    <feature id="org.eclipse.emf.ecp.view.table.ui.rcp.feature.source" version="0.0.0">
       <category name="org.eclipse.emf.ecp.emfforms"/>
    </feature>
+   <feature  id="org.eclipse.emfforms.common.prevalidation.feature.source" version="0.0.0">
+      <category name="org.eclipse.emf.ecp.emfforms"/>
+   </feature>
    <category-def name="org.eclipse.emf.ecp.sdk" label="All SDKs  (install one of these)">
       <description>
          Contains the ECP SDKs. Please install only one of these.
diff --git a/releng/org.eclipse.emf.ecp.repository/pom.xml b/releng/org.eclipse.emf.ecp.repository/pom.xml
index 14d1c0a267..c9b47ac3a2 100644
--- a/releng/org.eclipse.emf.ecp.repository/pom.xml
+++ b/releng/org.eclipse.emf.ecp.repository/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-features-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.site.feature</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	
 	<!-- see http://www.codetrails.com/blog/maven-tycho-how-to-configure-your-repos-mirror-and-statistics-uris -->
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
index df7759a077..f2499ed099 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
@@ -37,8 +37,7 @@
 <unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.ecore.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/emfstore/releases_18"/>
+<repository location="http://download.eclipse.org/emfstore/releases_19"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
index 6f6b5e4072..05e3b28bb7 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
@@ -28,7 +28,7 @@
 <unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_112"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_113"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
@@ -53,8 +53,7 @@
 <unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.ecore.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/emfstore/releases_18"/>
+<repository location="http://download.eclipse.org/emfstore/releases_19"/>
 </location>
 </locations>
 </target>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/pom.xml b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
index 405d801956..fa32c68c65 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>ecpRAP</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-target-definition</packaging>

 </project>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
index f9e1408a62..2bb45c12ff 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="1472048286">
+<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="1472048288">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
@@ -10,8 +10,8 @@
 <repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20160606-1311"/>
-<unit id="org.eclipse.platform.ide" version="4.6.0.I20160606-1100"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>
+<unit id="org.eclipse.platform.ide" version="4.6.3.M20170301-0400"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
@@ -22,26 +22,25 @@
 <repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="1.8.0.v20160606-1028"/>
-<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="1.8.0.v20160606-1028"/>
-<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="1.8.0.v20160606-1028"/>
-<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="1.8.0.v20160606-1028"/>
-<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="1.8.0.v20160606-1028"/>
-<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="1.8.0.v20160606-1028"/>
-<unit id="org.eclipse.emf.emfstore.ecore.feature.feature.group" version="1.8.0.v20160606-1028"/>
-<repository location="http://download.eclipse.org/emfstore/releases_18"/>
+<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/emfstore/releases_19"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20160606-1100"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>
 <unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
 <unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
-<unit id="org.eclipse.graphiti.feature.feature.group" version="0.13.0.v20160608-1043"/>
-<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.13.0.v20160608-1043"/>
+<unit id="org.eclipse.graphiti.feature.feature.group" version="0.13.2.v20161129-0820"/>
+<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.13.2.v20161129-0820"/>
 <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201606071713"/>
 <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201606071900"/>
 <unit id="org.eclipse.net4j.sdk.feature.group" version="4.5.0.v20160607-1511"/>
 <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.5.0.v20160607-1511"/>
-<unit id="org.eclipse.pde.feature.group" version="3.12.0.v20160606-1100"/>
+<unit id="org.eclipse.pde.feature.group" version="3.12.3.v20170301-0400"/>
 <unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/>
 <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201605250459"/>
 <repository location="http://download.eclipse.org/releases/neon"/>
@@ -408,8 +407,6 @@
 <plugin id="org.eclipse.emf.emfstore.common.model.edit.source"/>
 <plugin id="org.eclipse.emf.emfstore.common.model.source"/>
 <plugin id="org.eclipse.emf.emfstore.common.source"/>
-<plugin id="org.eclipse.emf.emfstore.ecore"/>
-<plugin id="org.eclipse.emf.emfstore.ecore.source"/>
 <plugin id="org.eclipse.emf.emfstore.example.installer"/>
 <plugin id="org.eclipse.emf.emfstore.examplemodel"/>
 <plugin id="org.eclipse.emf.emfstore.examplemodel.edit"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
index 4de120764a..a4d76c142e 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
@@ -5,11 +5,11 @@
   <parent>

     <groupId>org.eclipse.emf.ecp</groupId>

     <artifactId>ecp-parent</artifactId>

-    <version>1.12.0-SNAPSHOT</version>

+    <version>1.13.0-SNAPSHOT</version>

     <relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>

   </parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>ecp</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-target-definition</packaging>

 </project>
\ No newline at end of file
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
index 85a220c722..4d690c406f 100644
--- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
+++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
@@ -9,7 +9,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_112/"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_113/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.0.0"/>
@@ -17,7 +17,7 @@
 <unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/emfstore/releases_18"/>
+<repository location="http://download.eclipse.org/emfstore/releases_19"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/EcoreEditorGenerateJavaCode.test b/tests/ECPQ7Tests/EPPTests/update-site/project/EcoreEditorGenerateJavaCode.test
new file mode 100644
index 0000000000..96d9689b8b
--- /dev/null
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/EcoreEditorGenerateJavaCode.test
@@ -0,0 +1,70 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _ihvnUC3mEeSwhO5Nwx0hPg,_tmlPYBO2EeeY1-76dQ9m2g
+Element-Name: EcoreEditorGenerateJavaCode
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _fDG5sBPIEeeY1-76dQ9m2g
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 3/28/17 5:10 PM
+Testcase-Type: ecl
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model/model/task.ecore" 
+    | select "org.eclipse.emf.ecp.makeithappen.model/model/task.ecore" | get-menu "Open With/Ecore Editor" | click
+with [get-editor "task.ecore" -type "Ecore Editor" | get-toolbar -after [get-label "Ecore Model Editor"]] {
+    get-property "getItems().ToolItem[1].getToolTipText()" | equals "Generate All" | verify-true
+    get-property "getItems().ToolItem[1].getData().getAction().getClassName()" 
+        | equals "org.eclipse.emfforms.internal.editor.genmodel.toolbaractions.GenerateEcoreEditorJavaCodeAction$CreateEcoreJavaCodeAction" 
+        | verify-true
+    get-property "getItems().ToolItem[1].getStyle()" | equals "[DROP_DOWN]" | verify-true
+}
+get-editor "task.ecore" -type "Ecore Editor" | get-button "Generate All" | click -arrow
+get-menu "Generate Model" | click
+with [get-view "Project Explorer" | get-tree] {
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task" 
+        | get-property caption | equals "org.eclipse.emf.ecp.makeithappen.model.task" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task.impl" 
+        | get-property caption | equals "org.eclipse.emf.ecp.makeithappen.model.task.impl" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task.util" 
+        | get-property caption | equals "org.eclipse.emf.ecp.makeithappen.model.task.util" | verify-true
+}
+with [get-view "Project Explorer" | get-tree] {
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/Gender.java" 
+        | get-property caption | equals "Gender.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/Nationality.java" 
+        | get-property caption | equals "Nationality.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/Task.java" 
+        | get-property caption | equals "Task.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/TaskFactory.java" 
+        | get-property caption | equals "TaskFactory.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/TaskPackage.java" 
+        | get-property caption | equals "TaskPackage.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/User.java" 
+        | get-property caption | equals "User.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/UserGroup.java" 
+        | get-property caption | equals "UserGroup.java" | verify-true
+}
+with [get-view "Project Explorer" | get-tree] {
+    get-property "getItemCount()" | equals 1 | verify-true
+    get-property "getItems().TreeItem[0].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model" | verify-true
+}
+with [get-editor "task.ecore" | get-button "Generate All"] {
+    click
+}
+get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model"
+with [get-view "Project Explorer" | get-tree] {
+    get-property itemCount | equals 4 | verify-true
+    get-property "getItems().TreeItem[0].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model" | verify-true
+    get-property "getItems().TreeItem[1].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model.edit" | verify-true
+    get-property "getItems().TreeItem[2].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model.editor" 
+        | verify-true
+    get-property "getItems().TreeItem[3].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model.tests" 
+        | verify-true
+}
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/EcoreEditorGenerateJavaCodeNoGenmodel.test b/tests/ECPQ7Tests/EPPTests/update-site/project/EcoreEditorGenerateJavaCodeNoGenmodel.test
new file mode 100644
index 0000000000..26fe835ae3
--- /dev/null
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/EcoreEditorGenerateJavaCodeNoGenmodel.test
@@ -0,0 +1,28 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _ihvnUC3mEeSwhO5Nwx0hPg,_tmlPYBO2EeeY1-76dQ9m2g
+Element-Name: EcoreEditorGenerateJavaCodeNoGenmodel
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _1ztjsBPIEeeY1-76dQ9m2g
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 3/28/17 5:13 PM
+Testcase-Type: ecl
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model/model/task.genmodel" 
+    | key-type Del
+get-window Delete | get-button OK | click
+
+get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model/model/task.ecore" 
+    | select "org.eclipse.emf.ecp.makeithappen.model/model/task.ecore" | get-menu "Open With/Ecore Editor" | click
+get-editor "task.ecore" | get-button "Generate All" | click
+get-window "No GenModel file found" 
+    | get-label "No GenModel file referencing the current EPackage was found next to your Ecore file." 
+    | get-property caption 
+    | equals "No GenModel file referencing the current EPackage was found next to your Ecore file." | verify-true
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/GenModelEditorGenerateJavaCode.test b/tests/ECPQ7Tests/EPPTests/update-site/project/GenModelEditorGenerateJavaCode.test
new file mode 100644
index 0000000000..15255b0a0e
--- /dev/null
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/GenModelEditorGenerateJavaCode.test
@@ -0,0 +1,69 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _ihvnUC3mEeSwhO5Nwx0hPg,_tmlPYBO2EeeY1-76dQ9m2g
+Element-Name: GenModelEditorGenerateJavaCode
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference: 
+Id: _DKqGwBO1EeeY1-76dQ9m2g
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 3/28/17 5:06 PM
+Testcase-Type: ecl
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model/model/task.genmodel" 
+     | get-menu "Open With/Genmodel Editor" | click
+with [get-editor "task.genmodel" -type "Genmodel Editor" | get-toolbar -after [get-label "Genmodel Editor"]] {
+    get-property "getItems().ToolItem[1].getToolTipText()" | equals "Generate All" | verify-true
+    get-property "getItems().ToolItem[1].getData().getAction().getClassName()" 
+        | equals "org.eclipse.emfforms.internal.editor.genmodel.toolbaractions.GenerateJavaCodeAction$CreateJavaCodeAction" 
+        | verify-true
+    get-property "getItems().ToolItem[1].getStyle()" | equals "[DROP_DOWN]" | verify-true
+}
+get-editor "task.genmodel" -type "Genmodel Editor" | get-button "Generate All" | click -arrow
+get-menu "Generate Model" | click
+with [get-view "Project Explorer" | get-tree] {
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task" 
+        | get-property caption | equals "org.eclipse.emf.ecp.makeithappen.model.task" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task.impl" 
+        | get-property caption | equals "org.eclipse.emf.ecp.makeithappen.model.task.impl" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task.util" 
+        | get-property caption | equals "org.eclipse.emf.ecp.makeithappen.model.task.util" | verify-true
+}
+with [get-view "Project Explorer" | get-tree] {
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/Gender.java" 
+        | get-property caption | equals "Gender.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/Nationality.java" 
+        | get-property caption | equals "Nationality.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/Task.java" 
+        | get-property caption | equals "Task.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/TaskFactory.java" 
+        | get-property caption | equals "TaskFactory.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/TaskPackage.java" 
+        | get-property caption | equals "TaskPackage.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/User.java" 
+        | get-property caption | equals "User.java" | verify-true
+    get-item "org.eclipse.emf.ecp.makeithappen.model/src/org.eclipse.emf.ecp.makeithappen.model.task/UserGroup.java" 
+        | get-property caption | equals "UserGroup.java" | verify-true
+}
+with [get-view "Project Explorer" | get-tree] {
+    get-property "getItemCount()" | equals 1 | verify-true
+    get-property "getItems().TreeItem[0].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model" | verify-true
+}
+with [get-editor "task.genmodel" | get-button "Generate All"] {
+    click
+}
+get-view "Project Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model"
+with [get-view "Project Explorer" | get-tree] {
+    get-property itemCount | equals 4 | verify-true
+    get-property "getItems().TreeItem[0].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model" | verify-true
+    get-property "getItems().TreeItem[1].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model.edit" | verify-true
+    get-property "getItems().TreeItem[2].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model.editor" 
+        | verify-true
+    get-property "getItems().TreeItem[3].getText()" | equals "org.eclipse.emf.ecp.makeithappen.model.tests" 
+        | verify-true
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/ModelOnlyWorkspaceContext.ctx b/tests/ECPQ7Tests/EPPTests/update-site/project/ModelOnlyWorkspaceContext.ctx
new file mode 100644
index 0000000000..c2809940f0
--- /dev/null
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/ModelOnlyWorkspaceContext.ctx
@@ -0,0 +1,136 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Context-Type: org.eclipse.rcptt.ctx.workspace
+Element-Name: ModelOnlyWorkspaceContext
+Element-Type: context
+Element-Version: 2.0
+Id: _tmlPYBO2EeeY1-76dQ9m2g
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 3/28/17 3:01 PM
+
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.settings/org.eclipse.jdt.core.prefs-48b9b7dc-2f42-3171-8f65-ce3238ddfe6e
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/.settings/org.eclipse.jdt.core.prefs
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVjrEKAjEQRHs/ZuE6
+mzR2WvkL8TJ3rCSbMJsT/HsjXO/ZDMMwDx7mrM0hjVhA2AyXF+haLUynylWwP56py1yJEaVpBkdJWGGi
+ltVwc17eHd8xwOIjIx3ke+SKfs+xL5UlTHL+CZaWNQ7ZA+fGOlyKRHewXxOs66JgAFl5EIZt5U/U68Zd
+8ANQSwcIkBprkIcAAABlAQAAUEsBAhQAFAAICAgAAAAhAJAaa5CHAAAAZQEAAAgACQAAAAAAAAAAAAAA
+AAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAMYAAAAAAA==
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.settings/org.eclipse.jdt.core.prefs-48b9b7dc-2f42-3171-8f65-ce3238ddfe6e--
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.settings/org.eclipse.pde.core.prefs-ca86bf0d-59d3-3906-a2af-374513707cf7
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/.settings/org.eclipse.pde.core.prefs
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAAAtydEJgDAMQMH/DlNw
+gO7gClqfUglpTWxxfBG83yNLaU5sxo6hGY8D81I1TaFJP4rOVk/yHXlu9BtP+yJOMLzKIBpXL8badRP+
+ewFQSwcIRGUd3UsAAABZAAAAUEsBAhQAFAAICAgAAAAhAERlHd1LAAAAWQAAAAgACQAAAAAAAAAAAAAA
+AAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAIoAAAAAAA==
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.settings/org.eclipse.pde.core.prefs-ca86bf0d-59d3-3906-a2af-374513707cf7--
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.classpath-d6f98db9-b6c0-3e91-9b07-7582b4bc4b2b
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/.classpath
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkMFqAjEQhs/1KZbc
+na03D7tKkS1U0Bbd9ioxGdZp00mcJKJvbxcqLUIL3uYfvvn4mWp6/HTFASWS51qN4F4VyMZb4q5Wr+3j
+cKymk0FlnI4x6LSbDO5+AnKSU/FBbGtlPKuiX9bKSwdoHIWI8G4TOJ3Z7L6MMF81m9nzsn14Wjar8poj
+TiisHVjc5g4yfV+iwDpptlrs26I9BSzn+qDXzXAEY1Xe2ihYBOMFQXCfSdC+uNwRx39MUczF1I9/gz6n
+kNOF3RL3bFX++t4ZUEsHCJdL+mfNAAAAcQEAAFBLAQIUABQACAgIAAAAIQCXS/pnzQAAAHEBAAAIAAkA
+AAAAAAAAAAAAAAAAAAAuY29udGVudFVUBQABAAAAAFBLBQYAAAAAAQABAD8AAAAMAQAAAAA=
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.classpath-d6f98db9-b6c0-3e91-9b07-7582b4bc4b2b--
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF-3a4049b2-c613-3669-a633-4db6a8805d66
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAABNzUEKwjAQBdB9T5EL
+NFhXkqXQjVAXFtyP7a8OJpM0TYre3oJWymyG/+YzDQkPmFJ5RZzYi1GV3hXHLL1F2fzwb/tVzuRgVON7
+2DVq3+7mLXdf8vGu0VkOEzTcsOxBO3qC04NCgGi37W6fLzNmsjww4uoXjJkj+vqFLqflspaZoxcHSUad
+aKa2Lit9KD5QSwcI01cVFI0AAADPAAAAUEsBAhQAFAAICAgAAAAhANNXFRSNAAAAzwAAAAgACQAAAAAA
+AAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAMwAAAAAAA==
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF-3a4049b2-c613-3669-a633-4db6a8805d66--
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.project-9f8bd933-8ef2-35df-98eb-02b460f7903e
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/.project
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAAC9ks1OAyEUhdf2KZrZ
+C3bngk4Ta9zVmFQf4Aq3UypcCDCNj++dnzZO1cTExN05l3P4CKBW797Nj5iyDbSsFuKmmiPpYCw1y+rl
++eH6tlrVMxVTOKAu95h1srFwuJ5dKQKPdUiNQO1szCjQ71hH4eENbdlDjEjCB4NOyT7MJR28Ryq1kifF
+w3H/3Gn52by21pltRM1mdGuuAZlu8M0RDqYIHRILOEKfx3SGcwFS03bUPFg58UpeEn6DjAbFBsjuMJe7
+fyNu9R49/Jk3DsYrZlRpEw7RQX8BP7m2sfTYL3bcPvRDfvIadFk5ScadX33yxT4AUEsHCNkbY5jxAAAA
+nwIAAFBLAQIUABQACAgIAAAAIQDZG2OY8QAAAJ8CAAAIAAkAAAAAAAAAAAAAAAAAAAAuY29udGVudFVU
+BQABAAAAAFBLBQYAAAAAAQABAD8AAAAwAQAAAAA=
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/.project-9f8bd933-8ef2-35df-98eb-02b460f7903e--
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
+Content-Type: q7/binary
+Entry-Name: .q7.content
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVk8tuwjAQRfd8ReQ9
+dmHRB0pAtAKJRaBVkVpWVXCGYPBL8VDo39cBElFEWrpzknPv3BlPwt5OyeATcieMjkiL3pAANDep0FlE
+Nrho3pNetxGaPKPApbAOaM4tIuW4o1uTr51NOHTeytOT0Qg7DHZKdCrbdmHrC2nX8e8jskS0Hca22y01
+KqPenL3HoxL5o1YlL5lCvueY51jFkUAnytOxSUFOtPw6z0gCkUbkA5V8nj1O2gOAWat5d5u+PKh2RrqN
+IAh5QWoszv7J5mYFHN3R+DQnqIU/W6qSNQhcJtaCpqqoTA5iL18ICaWWcpk4HwaXhF0GjsVqPs83QqYF
+YyFHAe4UMzL1gy99HCD6y3RVjjOn0y5WqZ+1ycEbw+LE8xeJTeGiJGTHHDW54sG03xyNh3Wx4v54NBy8
+Tmk8vN50LnTtIH5exlk1TNzat+T7qG16j2SgDz5XR3I5L+GQlQu03y1WLVfI/vt7dRvfUEsHCOilVxls
+AQAAuQMAAFBLAQIUABQACAgIAAAAIQDopVcZbAEAALkDAAAIAAkAAAAAAAAAAAAAAAAAAAAuY29udGVu
+dFVUBQABAAAAAFBLBQYAAAAAAQABAD8AAACrAQAAAAA=
+------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/model/task.ecore-8318bff2-a3ba-3874-ad52-da24d909f834
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/model/task.ecore
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAADNWFtP6zAMfudXVOWZ
+hsvL0bSBuIwJHW7iIp3X0HptDm1SJQ4b//44WduFyxDQSZy9rIpj+/Nnx6k7PJhXZfQE2gglR/FOsh1H
+IFOVCZmP4vu7061f8cH+xhBSpWEwvubpI88hmldi0CntOiUyI82A1kdxgVgPGJvNZomq8kTpnP25OOu2
+mJdbZnt+x+729g5tO79NC6j4lpAGuUwh3ojot9D0GF7oQlqK2oA3ANXUGdllY7ctjiSvaDNy80jP5v7m
+rNNstFirBWnNKv4IAgte1yBZpTIomVf17qW51jAV81FMKp1TUqXnOglVE6+aeNV90h3CccmNEVNBZEUU
++gCfa4LV0OmFLdS7VsmpXdWgORK9ppEW3FzSA2XnLrRwwpG7hehTrGwyNj5SqgQuG0/O1zXXZBkdwoWv
+tOBC9vd0IngulUGRHnuD7COXSiLMsUPlNk1Aghapdxrw2APRBa8DD86H0z/Uua1AomGfkw1ZCK0LigVR
+NWlkQR7bzN6itilazctT4PQP79TFIaIWDxa7MpZrST25pmPd5uGbUDIwqRa1i+lnEN3AFDS43tAgcoWR
+S1gSRJbvDei4yxiloVZG4FLmT7fpS4UFCnkNifFW+pFg7MOdDymy1Ij0kbIyG8VbOwEJHTm+00TuyNGx
+dNVNfVLbLyJ4y4aSa2xPHgsdoKB/frWh+hroFdJUaIPrabtrOXsUXQOnVLMuyW9z/LMoc5AZMR8U3GSx
+0s8sT1E8rbvCvo0GRQVX0xvIhcFFh/+JNvAG1gxEXuAaoCj7UPYFUxAYLPqDOZPYE4n0GeKlwOewLi+D
+5Z7Nj1J3NT0SOoiXHJwEy/0c0EuxKF+f+//j/sWv3TsvL2O3xrobfE1df6KVrfu1/p9743rDr6WIPsWv
+v/BW3etfZnUsbdVCaBp4G8Y5ZY9iaF/eL3jYKl4JT6lySRw98dKCK9r+aMJju8LrBHRFPT4qF8vdwkqU
+jvFipfj+92rR7UrRbc2lMKutniHF8AGoG0t8fPtdqK3WlrWwF0XtfO0tXHr5X/7E5wmN2gk1M+5MJTSP
+TzTkShOKY8qizPiyCA6lVNjMqEZZnS5n88Vo3YzZixGbIDGLomTjObpiyi4AuYO4HEQzWhEU/CM8j+IH
+bmCBvimcj8/cnvt24PZvZuElykKU77E4ZC+/bOxv/ANQSwcIMQ/yBnUDAAASEQAAUEsBAhQAFAAICAgA
+AAAhADEP8gZ1AwAAEhEAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAAB
+AAEAPwAAALQDAAAAAA==
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/model/task.ecore-8318bff2-a3ba-3874-ad52-da24d909f834--
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/model/task.genmodel-b6b8f319-7f0d-30b7-bd56-07b57313810b
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/model/task.genmodel
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAADFWG1P6zYU/s6vsHKn
+aZNGAmjSpl7KFSvtvWgUEC3SvrrJaeLh2JHtlHa/fsd23gqlu4VW4wPEjs9znnN83sL5l2XOyQKUZlL0
+g9PwJCAgYpkwkfaDx+no+Pfgy8XReQoilwnw3lcQY/tAljnrNXJnVg6RhO7hfj/IjCl6UfT8/BzKPA2l
+SqO/xtf1EYilgrVDEHNWaHAHIZ9HZycnZ9HQHguOCP54uZrEf4vWLAMSy2KlWJqZKSxNPxjUS/JT/DM5
+Ozk9PcZfv5KhR5nIUsVAxiX6IANBvuazb4SKhEiToa3hj5+WV5/x1+Xn9umSc+IgNVGgQS0gCck0Y5oU
+SqaK5g4A5QmNY5kXVKzQuSSnBhSjXLdIVAFuJ3hwQRmnMw6kFAkoJ4ync03k3C0quuS+nHEWkxsWg8Dl
+Au+vhXvOWJw1ShloFEVWCdNGsVlp8OZ+cdxws9VITYvwhps5pJRHUPDjxelJmJmcb/LLQAqvRyrda7df
+elpYkseECWbQG+Ty/tpzygsOOQhDLU8fBe7yr5iCGDFX/SBCMg0xvHt8LsKcPgEzGS0KEKGTiLSKMaoT
+ZnaXDa2YA3AM7Eqqd8JI5Zm4nXtepkxcX/WD70PoeOCW5pg9U6qfvFUeasCp1t+LFhqUDjE+FwzjK7RY
+wwapa+oHsDEXqttr8Gs8r0FIcXszGVP1hKnVD4wqISBKSjNcGhCJflMrloXQxkc4xqjJKR/ezf7GC7nG
+rR9s1FEmQHkdWMlgJBUmm3EVzSvBjLCh9fqFAW0mJTPwDoutrHamYkWY2oWngEylwuzddNf1O2+UI1Zw
+RkUMN7Cwhe43W1ibGjZiwBOkNceyAe017RpLLhqDtRveUVhW7pUFKHfFDzDneAWuGXhXetPuVIql55+u
+7zlQURbV8gJhzudoO0t9xb5wvnTuOI/WXtiT2AHuafxEU7DVFeZsWSfCjGqoXu2WUsQWxEJqW/zuq4QY
+0Sq9PWXHpgFvCX6KHH/PayhKrM9mVcCEzsGuBrbuGoa49Y15JPtuHcb2K1RbobV4NxiJCiVbuWpno3g0
+phyC6IMgI8g7MOdRbdqeLL114UI5M6t3m9vBQNaYw+L9VnexRsq2/f1gPf65J5zJfnAmdgTQezLu2lBb
+pfYD9lBq3QHbFHFX1NApxluFWy9fgOI23M3/YMo0ZlphV8pRFDtF+iI+qyq/huLKSdeuEVBTYjcjscIn
+GGSMJ+sw1Yl+4Fa94aXxgw8ObS+RI4HNe91vW/GxRWOJNatxyQ27wb62VpN2UZyAjhUr3DS1Wb+Qhs1X
+jeptdCZY2geZxLFTbyWEbQFsUm0ihK7H2g67eGN3o0sbLG+pqK3pB7dSWIutMqTbtKouhXdaqcuZ/asP
+aqVlv4Z/V/flKmOa9YZgjzKq7UjZBH3dZ/HTBTB5dd3/qvUWiCjOcPZqqXwECec4/GLrmBWt2dUpFlWC
+v874N3P8Ub9otnu7D4sczZnS5na3RN9ZCZp1cB2pH0sOqAEHLbY4qA2G5dgVHiC1n710S/nbi7ZnsHP6
+ITVkqMFkh9QgOiPaAdUkr9v1IdTgOMv4/97xfCh2G8EHStdXJcvicPXLwW8dVPbbJ1udJT696SC3rr/+
+Lo7ccv1/khdH/wJQSwcIsYfuo8gEAADPFAAAUEsBAhQAFAAICAgAAAAhALGH7qPIBAAAzxQAAAgACQAA
+AAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAABAAEAPwAAAAcFAAAAAA==
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/model/task.genmodel-b6b8f319-7f0d-30b7-bd56-07b57313810b--
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/build.properties-cc87da17-459e-3336-914d-458903e214fa
+Content-Type: q7/binary
+Entry-Name: contents/org.eclipse.emf.ecp.makeithappen.model/build.properties
+
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAAArzi8tSk7V01OwVSgu
+Stbnyi8tKSgtAfOTMvP0uYCEXmZeck5pSmoxUMzXNcRR19PPTV8nhksBFehxAQBQSwcIH3Tt+TwAAABM
+AAAAUEsBAhQAFAAICAgAAAAhAB907fk8AAAATAAAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQF
+AAEAAAAAUEsFBgAAAAABAAEAPwAAAHsAAAAAAA==
+------=_contents/org.eclipse.emf.ecp.makeithappen.model/build.properties-cc87da17-459e-3336-914d-458903e214fa--
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
index b727c7d552..1a6f73bc9c 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker EMFStore Provider Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
index d3134e60dd..180bd4d12c 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.changebroker.provider.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 		<build>
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
index 629f26a2dd..ad00ac9e94 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Change Broker Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
index c001f2868c..4747759156 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.changebroker.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 		<build>
diff --git a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
index 0cfccbfbfa..e2cea91412 100644
--- a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.common.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.12.0",
- org.eclipse.emf.ecp.common.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.13.0",
+ org.eclipse.emf.ecp.common.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)";visibility:=reexport
diff --git a/tests/org.eclipse.emf.ecp.common.test/pom.xml b/tests/org.eclipse.emf.ecp.common.test/pom.xml
index cfc8fde5b5..c1dcf6acf2 100644
--- a/tests/org.eclipse.emf.ecp.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.common.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.common.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF
index 9a7014ac08..39f0075b5a 100644
--- a/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.controls.fx.test/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Bundle-SymbolicName: org.eclipse.emf.ecp.controls.fx.test
 Bundle-Version: 1.3.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.controls.fx.test;version="1.3.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.controls.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.test.fx;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.controls.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common.test.fx;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
index 39582b9c6d..889d6fce76 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Rap Sessionprovider Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.12.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.13.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.rap.rwt.service;version="0.0.0"
 Service-Component: OSGI-INF/component.xml
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
index 926f9398d9..7141225163 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
index 9e428ee418..16170eec3e 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core RAP Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
index 8df87f8e35..f11352b8bd 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.rap.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
index aa9715c693..13f0f819c0 100644
--- a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Core Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.core.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.core.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.core.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="3.1.0",
  org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="4.0.0",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.core.test/pom.xml b/tests/org.eclipse.emf.ecp.core.test/pom.xml
index f798b4a889..e67f9d38d4 100644
--- a/tests/org.eclipse.emf.ecp.core.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.core.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
index ca116ccff5..10b5d929a5 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Diff Merge Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
index 9072775c10..435916e3fb 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.diffmerge.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
index 7a77aeda64..9075624f69 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECore GenModel Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Export-Package: org.eclipse.emf.ecp.ecore.editor.test;version="1.2.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.eclipse.ui.part;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
index c2fb383ed0..4dd448173a 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
@@ -5,11 +5,11 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.12.0-SNAPSHOT</version>

+		<version>1.13.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

   <groupId>org.eclipse.emf.ecp</groupId>

   <artifactId>org.eclipse.emf.ecp.ecore.editor.test</artifactId>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
index 3c3dc0b368..fc7367a9a4 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.edit.internal.swt.util;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.2,3.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.13.0,1.14.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
index 587c2004d1..1369b51a6c 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.edit.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<!-- When signing bundles we get a security exception using maven-surefire. 
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF
index 495af8c128..04351588da 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@ Bundle-Name: EMF To Web JSON Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.json.test
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)"
 Export-Package: org.eclipse.emf.ecp.emf2web.generator.json;version="1.0.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,1.1.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
index 00b57ce0ff..dc9cc5202d 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.ide.util.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
index 1177a62ba5..4ae92fc1b5 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.util.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperCyclicDependencies_PTest.java b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperCyclicDependencies_PTest.java
index 988665f6fa..ebdff57518 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperCyclicDependencies_PTest.java
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperCyclicDependencies_PTest.java
@@ -11,7 +11,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperDefaultPackageRegistryContents_PTest.java b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperDefaultPackageRegistryContents_PTest.java
index fac88f6fde..f5c216ff8a 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperDefaultPackageRegistryContents_PTest.java
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperDefaultPackageRegistryContents_PTest.java
@@ -20,7 +20,7 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperNoDependencies_PTest.java b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperNoDependencies_PTest.java
index be6a922aee..810c7397ad 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperNoDependencies_PTest.java
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperNoDependencies_PTest.java
@@ -14,7 +14,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperOneDependency_PTest.java b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperOneDependency_PTest.java
index 8ddfdb268b..bc90e6e588 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperOneDependency_PTest.java
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperOneDependency_PTest.java
@@ -14,7 +14,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperSubpackages_PTest.java b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperSubpackages_PTest.java
index 39cc4f5e5c..4645e73b19 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperSubpackages_PTest.java
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperSubpackages_PTest.java
@@ -22,7 +22,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperTwoDependencies_PTest.java b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperTwoDependencies_PTest.java
index 555e66a013..07e5c0e663 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperTwoDependencies_PTest.java
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/src/org/eclipse/emf/ecp/ide/util/test/EcoreHelperTwoDependencies_PTest.java
@@ -14,7 +14,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.ide.spi.util.EcoreHelper;
 import org.junit.After;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
index 1a98f20bc8..e6125a5bb3 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: IDEViewModelRegistry Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.0.0,3.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
index dd9ce35fd0..d75a34e297 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ide.view.service.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
index 581a52c74b..d418fb997d 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Integrationtest
 Bundle-SymbolicName: org.eclipse.emf.ecp.integrationtest
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.integrationtest.Activator
-Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
index 92d47d991d..26b42a9790 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.integrationtest</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
index 569735af60..44b6000128 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Model Quick Fix Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
index e818538347..9b95c9ad61 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.quickfix.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
index ab46069d7b..40da0720b7 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Test Model Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.test.university.provider.UniversityEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
index 23f694626a..91f79444df 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.model.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
index cf6621ab10..126dfa98e0 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecp.test.model.feature"
       label="ECP Test Model Feature"
-      version="1.12.0.qualifier">
+      version="1.13.0.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
index fc33c03e32..d331c5dc55 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.test.model.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
index 6fc8ffde5c..e598504d68 100644
--- a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Test Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.test.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university;version="1.12.0",
- org.eclipse.emf.ecp.test.university.impl;version="1.12.0",
- org.eclipse.emf.ecp.test.university.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.test.university;version="1.13.0",
+ org.eclipse.emf.ecp.test.university.impl;version="1.13.0",
+ org.eclipse.emf.ecp.test.university.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.test.model/pom.xml b/tests/org.eclipse.emf.ecp.test.model/pom.xml
index adaddc3cc4..d70ac80182 100644
--- a/tests/org.eclipse.emf.ecp.test.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.test.model</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
index 964313afa0..b5a6bf517e 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Validation View Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
index 666a2858ac..1cad6409b5 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.validation.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
index 6911afca2b..c69c1038c6 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.12.0",
- org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.13.0",
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
index 88bfb15ddb..29988f8e1b 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
index f8cd981bb2..a7e2585efb 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP String Modifier with Line Wrapping Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.linewrapper.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
index d3c0c291cc..5dcbd92849 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.linewrapper.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
index 896b4caf4d..86275dbf11 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Renderer Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.test;version="1.12.0"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.test;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
index 8fea3e6f9c..7c321aab82 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
index be78fcb244..0b5bb99794 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.test
-Bundle-Version: 1.12.0.qualifier
-Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.12.0"
+Bundle-Version: 1.13.0.qualifier
+Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.ui;bundle-version="3.104.0",
- org.eclipse.emf.ecp.explorereditorbridge;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.explorereditorbridge;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
index 101d98ff31..05b5db0fc7 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.ui.view.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
index 3a8fb417b9..c2ffb0ed72 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP Diagnostician Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
index ce9ffc4c74..efe256f594 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.validation.diagnostician.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
index ab5abe4c05..ef641a750f 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.validation.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.validation.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.emf.ecore;bundle-version="2.8.0",
  org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
index 781c7e72d0..c0d7e32a4a 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.validation.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
index 1ffd12ee20..2fb8588a14 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Categorization Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt.test
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.12.0"
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.swt.layout;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
index f14af4ea9c..aaa40c565f 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.categorization.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
index 0921adccf4..5ffa482b48 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Compound Control SWT Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.12.0"
+Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
index f1367c6b6d..ce2fe35fbb 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.compoundcontrol.swt.test</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
   <build>
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
index a9670b1b9f..6561a06ffe 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Model Context Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.context;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.context;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
index 4ff2e8794f..0f5c2f9cf7 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.context.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
index efd15aeb2a..f737c51120 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Multi Reference Control Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.control.multireference;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.control.multireference;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0",
  org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
index 5225210ce9..c84d2d994f 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.control.multireference.tests</artifactId>
@@ -67,5 +67,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
index c8a922505d..c0e63bb00d 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
@@ -2,32 +2,33 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt.tests;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="1.13.0"
 Import-Package: com.ibm.icu.text;version="52.1.1",
  org.eclipse.swt.widgets;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
index 0666a6ba4a..98fa028a6d 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.core.swt.tests</artifactId>
@@ -62,5 +62,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java
index 706602d513..60f3cdde23 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java
@@ -22,6 +22,7 @@ import java.text.DecimalFormat;
 import java.util.Locale;
 
 import org.eclipse.core.databinding.property.Properties;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
@@ -77,7 +78,8 @@ public class NumberControlRenderer_PTest extends AbstractControl_PTest {
 		when(localeProvider.getLocale()).thenReturn(Locale.getDefault());
 		final EMFFormsEditSupport editSupport = mock(EMFFormsEditSupport.class);
 		setup();
-		setRenderer(new NumberControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+		setRenderer(new NumberControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(),
+			getLabelProvider(),
 			getTemplateProvider(), editSupport, localizationService, localeProvider));
 		getRenderer().init();
 	}
@@ -104,8 +106,9 @@ public class NumberControlRenderer_PTest extends AbstractControl_PTest {
 		when(mockedEClassifier.getInstanceClass()).thenReturn(clazz);
 		when(mockedEStructuralFeature.getEType()).thenReturn(mockedEClassifier);
 		when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservableValue);
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservableValue);
 		when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
 			Properties.selfValue(mockedEStructuralFeature));
 		final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
@@ -128,8 +131,9 @@ public class NumberControlRenderer_PTest extends AbstractControl_PTest {
 		when(mockedEClassifier.getInstanceClass()).thenReturn(clazz);
 		when(mockedEStructuralFeature.getEType()).thenReturn(mockedEClassifier);
 		when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservableValue);
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservableValue);
 		when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
 			Properties.selfValue(mockedEStructuralFeature));
 
@@ -218,6 +222,26 @@ public class NumberControlRenderer_PTest extends AbstractControl_PTest {
 
 	}
 
+	@Test
+	public void testDatabindingServiceUsageChangeControlToDoubleValue() throws NoRendererFoundException,
+		NoPropertyDescriptorFoundExeption, DatabindingFailedException {
+		final double initialValue = 13;
+		final double changedValue = 42.5;
+		final EAttribute eAttribute = EcoreFactory.eINSTANCE.createEAttribute();
+		eAttribute.setEType(EcorePackage.eINSTANCE.getEDouble());
+		eAttribute.setName("doubleAttr");
+		final ObservingWritableValue mockedObservable = new ObservingWritableValue(realm, initialValue,
+			eAttribute);
+
+		final Text text = setUpDatabindingTest(mockedObservable);
+
+		final DecimalFormat format = getDecimalFormat(Double.class);
+		SWTTestUtil.typeAndFocusOut(text, format.format(changedValue));
+
+		assertEquals(changedValue, mockedObservable.getValue());
+
+	}
+
 	/**
 	 * Universal set up stuff for the data binding test cases.
 	 *
@@ -230,8 +254,9 @@ public class NumberControlRenderer_PTest extends AbstractControl_PTest {
 	private Text setUpDatabindingTest(final ObservingWritableValue mockedObservable) throws NoRendererFoundException,
 		NoPropertyDescriptorFoundExeption, DatabindingFailedException {
 		mockDatabindingIsUnsettable();
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservable, new ObservingWritableValue(mockedObservable));
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservable, new ObservingWritableValue(mockedObservable));
 		when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
 			Properties.selfValue(mockedObservable.getValueType()));
 
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java
index d770e941a7..762f7b1de7 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java
@@ -79,7 +79,8 @@ public class XMLDateControlRenderer_PTest extends AbstractControl_PTest {
 		final ImageRegistryService imageRegistryService = mock(ImageRegistryService.class);
 
 		setup();
-		setRenderer(new XMLDateControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+		setRenderer(new XMLDateControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(),
+			getLabelProvider(),
 			getTemplateProvider(), editSupport, localizationService, localeProvider, imageRegistryService));
 		getRenderer().init();
 	}
@@ -102,8 +103,9 @@ public class XMLDateControlRenderer_PTest extends AbstractControl_PTest {
 		final EStructuralFeature mockedEStructuralFeature = mock(EStructuralFeature.class);
 		when(mockedEStructuralFeature.isUnsettable()).thenReturn(false);
 		when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservableValue);
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservableValue);
 		final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
 		assertControl(render);
 	}
@@ -120,8 +122,9 @@ public class XMLDateControlRenderer_PTest extends AbstractControl_PTest {
 		final EStructuralFeature mockedEStructuralFeature = mock(EStructuralFeature.class);
 		when(mockedEStructuralFeature.isUnsettable()).thenReturn(false);
 		when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservableValue);
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservableValue);
 		final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
 
 		assertControl(render);
@@ -221,8 +224,9 @@ public class XMLDateControlRenderer_PTest extends AbstractControl_PTest {
 		NoPropertyDescriptorFoundExeption, DatabindingFailedException {
 		Mockito.reset(getDatabindingService());
 		mockDatabindingIsUnsettable();
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservable, new ObservingWritableValue(mockedObservable));
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservable, new ObservingWritableValue(mockedObservable));
 		when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
 			Properties.selfValue(mockedObservable.getValueType()));
 
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java
index 4422f322b5..b8b1c0277c 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java
@@ -20,6 +20,7 @@ import static org.mockito.Mockito.when;
 
 import org.eclipse.core.databinding.observable.Observables;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.property.Properties;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcoreFactory;
@@ -62,7 +63,8 @@ public class TextControlRenderer_PTest extends AbstractControl_PTest {
 		setTemplateProvider(mock(VTViewTemplateProvider.class));
 		final EMFFormsEditSupport editSupport = mock(EMFFormsEditSupport.class);
 		setup();
-		setRenderer(new TextControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+		setRenderer(new TextControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(),
+			getLabelProvider(),
 			getTemplateProvider(), editSupport));
 		getRenderer().init();
 	}
@@ -87,8 +89,9 @@ public class TextControlRenderer_PTest extends AbstractControl_PTest {
 		when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
 		final EStructuralFeature mockedEStructuralFeature = EcorePackage.eINSTANCE.getENamedElement_Name();
 		when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservableValue);
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservableValue);
 		final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
 		assertControl(render);
 	}
@@ -108,8 +111,9 @@ public class TextControlRenderer_PTest extends AbstractControl_PTest {
 		final EStructuralFeature mockedEStructuralFeature = mock(EStructuralFeature.class);
 		when(mockedEStructuralFeature.isUnsettable()).thenReturn(false);
 		when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservableValue);
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservableValue);
 		final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
 
 		assertControl(render);
@@ -203,9 +207,11 @@ public class TextControlRenderer_PTest extends AbstractControl_PTest {
 			Observables.constantObservableValue("antiException"));
 		Mockito.reset(getDatabindingService());
 		mockDatabindingIsUnsettable();
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservable, new ObservingWritableValue(mockedObservable));
-
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservable, new ObservingWritableValue(mockedObservable));
+		when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+			Properties.selfValue(mockedObservable.getValueType()));
 		final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
 		final Text text = (Text) Composite.class.cast(renderControl).getChildren()[0];
 		return text;
@@ -236,8 +242,9 @@ public class TextControlRenderer_PTest extends AbstractControl_PTest {
 		when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
 		final EStructuralFeature mockedEStructuralFeature = EcorePackage.eINSTANCE.getENamedElement_Name();
 		when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
-		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
-			mockedObservableValue);
+		when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class)))
+			.thenReturn(
+				mockedObservableValue);
 
 		final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
 		final Control textRender = Composite.class.cast(renderControl).getChildren()[0];
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
index 45ca844f92..11f66f3f17 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,40 +2,40 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Custom SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.custom.ui.swt.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.jface.viewers;version="0.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
index 074c199534..4647ba5def 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.custom.ui.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
index 5c1e0e1e60..29a25e07eb 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
@@ -2,12 +2,12 @@
 <feature
       id="org.eclipse.emf.ecp.view.dynamictree.feature"
       label="Dynamic Tree Feature"
-      version="1.12.0.qualifier"
+      version="1.13.0.qualifier"
       provider-name="Eclipse Modeling Project"
       plugin="org.eclipse.emf.ecp.view.dynamictree.model"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.ecp.license.feature"
-      license-feature-version="1.12.0.qualifier">
+      license-feature-version="1.13.0.qualifier">
 
    <description>
       %description
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
index 1ece400494..e4d91faff4 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
@@ -5,11 +5,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.dynamictree.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
index 75f2cd4913..dab45f4b8c 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Edit Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.edit;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.provider.DynamicTreeEditPlugin$Implementation
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
index dff3b283df..4c801089b9 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.edit</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
index fdb5e808d4..f2f4f29270 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.test.Activator
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.12.0";
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.13.0";
   uses:="org.eclipse.emf.ecore,
    org.eclipse.core.databinding,
    org.eclipse.emf.ecp.view.context,
@@ -17,23 +17,23 @@ Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.12.0"
    org.eclipse.emf.ecp.internal.ui.view.builders"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.junit;bundle-version="4.11.0",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.200,2.0.0)",
  org.eclipse.swt;bundle-version="[3.102.1,4.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
index bf8ca14deb..3d70580594 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
index c0f21e0f32..f3e2dcacc2 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dynamic Containment Tree Model Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.12.0",
- org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Service-Component: OSGI-INF/dynamicContainmentTreeDMRConverter.xml
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
index b43ec5ef35..5d3e442e40 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.dynamictree.model</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
index bd8e49ca9d..fa48f8e0c9 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Dynamic Tree SWT UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui.swt;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.13.0,1.14.0)",
  org.eclipse.jface.layout;version="0.0.0",
  org.eclipse.swt;version="0.0.0",
  org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
index 09757cf638..81ab090c43 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
@@ -7,11 +7,11 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.12.0-SNAPSHOT</version>

+		<version>1.13.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 

   <artifactId>org.eclipse.emf.ecp.view.dynamictree.ui.swt</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
index 9a98c4aa34..d63ae036a0 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Dynamic Tree UI
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
index 4cb5b35c07..cae4b2d87c 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
@@ -7,11 +7,11 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.12.0-SNAPSHOT</version>

+		<version>1.13.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 

   <artifactId>org.eclipse.emf.ecp.view.dynamictree.ui</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 </project>

diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
index 6697a7d2ab..5fd40776a5 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._140to170;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._160to170;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._140to170;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._160to170;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
index a4b5ac8480..e6ec942739 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
@@ -6,12 +6,12 @@
 <parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
   </parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.edapt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
index 6e684e4740..67022565de 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
@@ -2,42 +2,42 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.util.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.12.0",
- org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.13.0",
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.0.0,5.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
index 824686527c..42255584f1 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.edapt.util.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
index a463c6df87..a5af2f60a1 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Group SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.ui.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
index af74e9043a..dad5b5956d 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.group.ui.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
index c2cbc58adc..020b8f879b 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Horizontal SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
index 843fca9548..1053cc816f 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.horizontal.ui.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
index b86d611a43..5f110409e7 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
index 7fa602b182..82ab2f314c 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.indexdmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
index 8542032439..0ff181bd12 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.12.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.12.0",
- org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.13.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.13.0",
+ org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
index 98937fd236..ac0ad8e03d 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.keyattributedmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
index d463b6f117..3c634bc272 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
index ada9f237b1..402d0e5923 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.mappingdmr.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
index cd26987157..ddcc5dc97f 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Common Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.12.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
index fdf7c4b169..b908c920a5 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
index 30d0a9714e..f70ae2bbed 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
index e7ff7eabdb..28b1b44586 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.edit.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
index 901eecc251..27e0b0e5a4 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecp.view.model.editor.test.feature"
       label="View Model Editor Test Feature"
-      version="1.12.0.qualifier">
+      version="1.13.0.qualifier">
 
    <description>
       Plugins for testing the View Model Editor with Q7. 
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
index c4598ec363..3cbd44e114 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.eclipse.emf.ecp</groupId>
     <artifactId>ecp-features-parent</artifactId>
-    <version>1.12.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
   </parent>
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.model.editor.test.feature</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
index 6c20f8a3d8..ebffcfad7f 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Editor Test Plugin for Q7
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.testplugin;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
index 8842f989da..7c7f573617 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.editor.testplugin</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
index cb29615f2d..2a49eaf65b 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Integrationtest
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.integrationtest
-Bundle-Version: 1.12.0.qualifier
-Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
index b6cc82acfd..69fcecddfb 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.integrationtest</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/src/org/eclipse/emf/ecp/view/model/integrationtest/ChildrenDescriptorExtension_PTest.java b/tests/org.eclipse.emf.ecp.view.model.integrationtest/src/org/eclipse/emf/ecp/view/model/integrationtest/ChildrenDescriptorExtension_PTest.java
index 5b37f1b7cb..d8ffe4643c 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/src/org/eclipse/emf/ecp/view/model/integrationtest/ChildrenDescriptorExtension_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/src/org/eclipse/emf/ecp/view/model/integrationtest/ChildrenDescriptorExtension_PTest.java
@@ -76,7 +76,7 @@ public class ChildrenDescriptorExtension_PTest {
 		- NUMBER_OF_EXTERNAL_COMPOSITES + 2 + 1;
 
 	private static final int CONTROL_CHILD_COUNT = COMPOSITE_CHILD_COUNT + DOMAINMODELREFERENCE_COUNT;
-	private static final int TABLECONTROL_CHILD_COUNT = CONTROL_CHILD_COUNT + 3;
+	private static final int TABLECONTROL_CHILD_COUNT = CONTROL_CHILD_COUNT + 4;
 	private static final int ACTION_CHILD_COUNT = 0;
 	private static final int GROUPEDGRID_CHILD_COUNT = RENDERABLE_CHILD_COUNT + 1;
 	private static final int GRIDEDGROUP_CHILD_COUNT = 1;
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
index 4615b19826..ac536a5329 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ECP XMI Provider Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.junit;bundle-version="4.0.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
index d3e2a7e518..16993dc5bb 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.model.provider.xmi.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
index 951abe47ef..213f344e5f 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Model Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.12.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
index 0c61febdee..017c4f0555 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/.settings/.api_filters b/tests/org.eclipse.emf.ecp.view.rule.test/.settings/.api_filters
new file mode 100644
index 0000000000..bb8b284689
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.ecp.view.rule.test" version="2">
+    <resource path="src/org/eclipse/emf/ecp/view/rule/test/RuleService_PTest.java" type="org.eclipse.emf.ecp.view.rule.test.RuleService_PTest$ViewModelContextStub">
+        <filter comment="stub implementation for testing." id="574619656">
+            <message_arguments>
+                <message_argument value="ViewModelContext"/>
+                <message_argument value="ViewModelContextStub"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
index d577a45627..c902213a3c 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
index 95631cb69c..d7701cd694 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.rule.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
index 8e6b079c08..8d5afe2657 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Rule Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.ui.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
index 5f03f97a8e..cea1526ebd 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.rule.ui.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
index 966d9d2bbf..e990e6c002 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Stack Model SWT Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
index ed83c9c426..2244e361fb 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.stack.ui.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/src/org/eclipse/emf/ecp/view/stack/ui/swt/test/SWTStack_PTest.java b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/src/org/eclipse/emf/ecp/view/stack/ui/swt/test/SWTStack_PTest.java
index faaf83e897..6a91216261 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/src/org/eclipse/emf/ecp/view/stack/ui/swt/test/SWTStack_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/src/org/eclipse/emf/ecp/view/stack/ui/swt/test/SWTStack_PTest.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.emfstore.bowling.BowlingFactory;
 import org.eclipse.emf.emfstore.bowling.BowlingPackage;
 import org.eclipse.emf.emfstore.bowling.Gender;
 import org.eclipse.emf.emfstore.bowling.Player;
+import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
@@ -107,7 +108,7 @@ public class SWTStack_PTest {
 		composite = (Composite) composite.getChildren()[0];
 		boolean comboFound = false;
 		for (final Control control : composite.getChildren()) {
-			if (control instanceof Combo) {
+			if (control instanceof Combo || control instanceof CCombo) {
 				comboFound = true;
 				break;
 			}
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
index f04866ad7c..0582914398 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Table Model Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.12.0",
- org.eclipse.emf.ecp.view.table.model.test;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.13.0",
+ org.eclipse.emf.ecp.view.table.model.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
index 88ac889020..195e494b00 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emf.ecp.view.table.model.test</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
index 6f49f6cc86..a5516d4881 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,41 +2,41 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the Group SWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.13.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.equinox.registry;bundle-version="[3.5.400,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.common;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.11.1,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.13.0,1.14.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
index 3f79b71f9b..6322b7d8aa 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.table.ui.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/AllTests.java b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/AllTests.java
index c82f00395b..f4b5420ff2 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/AllTests.java
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/AllTests.java
@@ -17,7 +17,7 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ SWTTable_PTest.class, SWTTableDatabindingLabel_PTest.class })
+@SuiteClasses({ SWTTable_PTest.class, SWTTableDatabindingLabel_PTest.class, RunnableManagerTest.class })
 public class AllTests {
 
 }
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/RunnableManagerTest.java b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/RunnableManagerTest.java
new file mode 100644
index 0000000000..489a95e9f4
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/RunnableManagerTest.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * edgar - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.table.ui.swt.test;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.eclipse.emf.ecp.view.internal.table.swt.RunnableManager;
+import org.eclipse.swt.widgets.Display;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+public class RunnableManagerTest {
+
+	private static final int NR_RUNNABLES = 1000;
+	private static final ScheduledExecutorService POOL = Executors.newScheduledThreadPool(1);
+	private static final ScheduledExecutorService ASYNC_POOL = Executors.newScheduledThreadPool(1);
+	private static final Display DISPLAY = mock(Display.class);
+
+	private Runnable createRunnable(final CountDownLatch latch,
+		final AtomicInteger counter) {
+
+		return new Runnable() {
+			@Override
+			public void run() {
+				counter.getAndIncrement();
+				latch.countDown();
+			}
+		};
+	}
+
+	@BeforeClass
+	public static void beforeClass() {
+		doAnswer(new Answer<Void>() {
+			@Override
+			public Void answer(InvocationOnMock invocation) throws Throwable {
+				ASYNC_POOL.submit(
+					Runnable.class.cast(invocation.getArguments()[0]));
+				return null;
+			}
+		}).when(DISPLAY).asyncExec(any(Runnable.class));
+
+	}
+
+	@Test
+	public void managedRunnable() throws InterruptedException {
+		// setup
+		final AtomicInteger asyncCounter = new AtomicInteger(0);
+		final AtomicInteger counter = new AtomicInteger(0);
+		final CountDownLatch latch = new CountDownLatch(NR_RUNNABLES);
+		final RunnableManager runnableManager = new RunnableManager(DISPLAY);
+
+		// act
+		for (int x = 0; x < NR_RUNNABLES; x++) {
+			runnableManager.executeAsync(createRunnable(latch, asyncCounter));
+			POOL.submit(createRunnable(latch, counter));
+		}
+		latch.await();
+
+		// assert
+		// we expect more runnables to be executed via the fixed pool since
+		// the RunnableManager only lets a single Runnable to be executed
+		assertTrue(counter.intValue() > asyncCounter.intValue());
+	}
+
+}
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
index e6f4169468..972c4c3952 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Template Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.emf.edit.domain;version="0.0.0",
  org.eclipse.emf.edit.provider;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
index 481f24f979..f1fa6e1af4 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.12.0-SNAPSHOT</version>

+		<version>1.13.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 	<artifactId>org.eclipse.emf.ecp.view.template.service.test</artifactId>

 	<packaging>eclipse-test-plugin</packaging>

-	<version>1.12.0-SNAPSHOT</version>

+	<version>1.13.0-SNAPSHOT</version>

 	<groupId>org.eclipse.emf.ecp</groupId>

 	

 		<build>

diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
index 770a4e0267..46f30d228f 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Helper Class for the SWT View Model Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common.swt
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.13.0"
 Require-Bundle: org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
index c1a87033a7..c694e25aa4 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
@@ -7,12 +7,12 @@
 	<parent>

 		<groupId>org.eclipse.emf.ecp</groupId>

 		<artifactId>ecp-tests-parent</artifactId>

-		<version>1.12.0-SNAPSHOT</version>

+		<version>1.13.0-SNAPSHOT</version>

 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>

 	</parent>

 

   <artifactId>org.eclipse.emf.ecp.view.test.common.swt</artifactId>

   <packaging>eclipse-plugin</packaging>

-  <version>1.12.0-SNAPSHOT</version>

+  <version>1.13.0-SNAPSHOT</version>

 

 </project>

diff --git a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
index c3ef0d4366..ee7226326d 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Test Plugin
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.13.0"
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
index e3f357e81b..d65cf703a4 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<artifactId>org.eclipse.emf.ecp.view.test.common</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
index 35e42b0ed7..8eae426589 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the TreeMasterDetail Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
index d69572dcc3..84d93ceeb3 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
   
   <groupId>org.eclipse.emf.ecp</groupId>
   <artifactId>org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test</artifactId>
-  <version>1.12.0-SNAPSHOT</version>
+  <version>1.13.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
index 512a1735b5..6c8805a8ac 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms TreeMasterDetail Validation Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
index 65bdf2b28e..69efd9d613 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.treemasterdetail.validation.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
index eb03453b5d..235d3230de 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
@@ -2,39 +2,39 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor SWTBot Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.ui.editor.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Activator: org.eclipse.emf.ecp.view.ui.editor.test.Activator
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.12.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
- org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.13.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
+ org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.swtbot.eclipse.finder;bundle-version="[2.1.1,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="4.11.0",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="3.102.0",
  org.eclipse.swtbot.junit4_x;bundle-version="2.1.1",
  org.eclipse.jface.databinding;bundle-version="1.6.200",
  org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.ui.swt.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
index f0a61106d6..4334ca9d3c 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.ui.editor.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/CellReadOnly_PTest.java b/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/CellReadOnly_PTest.java
index d7ef64a93a..277210b7e0 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/CellReadOnly_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/CellReadOnly_PTest.java
@@ -110,12 +110,11 @@ public class CellReadOnly_PTest extends ECPCommonSWTBotTest {
 		final SWTBotTable table = bot.table();
 		table.click(0, 1);
 		bot.sleep(1000);
-		final SWTBotText textCell01 = bot.text();
 		Display.getDefault().syncExec(new Runnable() {
 
 			@Override
 			public void run() {
-				assertFalse(textCell01.widget.getEditable());
+				assertEquals(table.cell(0, 1), "a");
 			}
 		});
 
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/controls/ControlsSWTBot_PTest.java b/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/controls/ControlsSWTBot_PTest.java
index feb5679bd5..e0b0742221 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/controls/ControlsSWTBot_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/src/org/eclipse/emf/ecp/view/ui/editor/test/controls/ControlsSWTBot_PTest.java
@@ -1,586 +1,586 @@
-/*******************************************************************************

- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.

- *

- * 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:

- * Johannes Faltermeier - initial API and implementation

- ******************************************************************************/

-package org.eclipse.emf.ecp.view.ui.editor.test.controls;

-

-import java.math.BigDecimal;

-import java.text.NumberFormat;

-import java.util.ArrayList;

-import java.util.Calendar;

-import java.util.Collection;

-import java.util.Date;

-import java.util.List;

-import java.util.Locale;

-

-import org.eclipse.emf.common.command.BasicCommandStack;

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.emf.ecp.view.spi.model.VControl;

-import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;

-import org.eclipse.emf.ecp.view.spi.model.VView;

-import org.eclipse.emf.ecp.view.spi.model.VViewFactory;

-import org.eclipse.emf.ecp.view.test.common.spi.GCCollectable;

-import org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest;

-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;

-import org.eclipse.emf.emfstore.bowling.BowlingFactory;

-import org.eclipse.emf.emfstore.bowling.BowlingPackage;

-import org.eclipse.emf.emfstore.bowling.Game;

-import org.eclipse.emf.emfstore.bowling.Gender;

-import org.eclipse.emf.emfstore.bowling.Matchup;

-import org.eclipse.emf.emfstore.bowling.Player;

-import org.eclipse.emf.emfstore.bowling.TournamentType;

-import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;

-import org.eclipse.swtbot.swt.finder.results.VoidResult;

-import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;

-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;

-import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;

-import org.eclipse.swtbot.swt.finder.widgets.SWTBotDateTime;

-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;

-import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;

-import org.junit.AfterClass;

-import org.junit.runner.RunWith;

-import org.junit.runners.Parameterized;

-import org.junit.runners.Parameterized.Parameters;

-

-/**

- * Configurable SWTBotTest displaying and entering data in ECP Controls.

- *

- * @author jfaltermeier

- *

- */

-@RunWith(Parameterized.class)

-public class ControlsSWTBot_PTest extends ECPCommonSWTBotTest {

-

-	private static double memBefore;

-	private static double memAfter;

-

-	private final boolean isDomainCollectable;

-	private final Boolean[] configuration;

-

-	private GCCollectable viewCollectable;

-	private GCCollectable domainCollectable;

-

-	public ControlsSWTBot_PTest(boolean isDomainCollectable, Boolean[] b) {

-		this.isDomainCollectable = isDomainCollectable;

-		configuration = b;

-	}

-

-	@Parameters

-	public static Collection<Object[]> data() {

-		final List<Object[]> data = new ArrayList<Object[]>();

-

-		data.addAll(createConfig(25, new Boolean[] { true, false, false, false, false, false, false, false, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, true, false, false, false, false, false, false, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, true, false, false, false, false, false, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, true, false, false, false, false, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, true, false, false, false, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, true, false, false, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, true, false, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, true, false,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, false, true,

-			false, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, false, false,

-			true, false }));

-		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, false, false,

-			false, true }));

-		data.addAll(createConfig(25, new Boolean[] { true, true, true, true, true, true, true, true, true, true, true

-		}));

-

-		return data;

-	}

-

-	@AfterClass

-	public static void afterClass() {

-		final double diff = Math.abs((memBefore - memAfter) / memBefore);

-		assertTrue(diff < 0.05);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest#logic()

-	 */

-	// BEGIN COMPLEX CODE

-	@Override

-	public void logic() {

-		if (configuration[0]) {

-			doActionStringControl(0);

-		}

-		if (configuration[1]) {

-			doActionDateTimeControl(1);

-		}

-		if (configuration[2]) {

-			doActionNumericalControlDouble(2);

-		}

-		if (configuration[3]) {

-			doActionBooleanControl(3);

-		}

-		if (configuration[4]) {

-			doActionAttributeMultiControl(4);

-		}

-		if (configuration[5]) {

-			doActionNumericalControlInteger(5);

-		}

-		if (configuration[6]) {

-			doActionMultiControlEEnum(6);

-		}

-		if (configuration[7]) {

-			doActionNumericalControlBigDec(7);

-		}

-		if (configuration[8]) {

-			doActionEEnumControl(8);

-		}

-		if (configuration[9]) {

-			doActionReferenceMultiControl(9);

-		}

-		if (configuration[10]) {

-			doActionLinkControl(10);

-		}

-	}

-

-	// END COMPLEX CODE

-

-	private void doActionStringControl(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotText text = bot.textWithLabel("Name");

-				text.setFocus();

-				text.setText("Maxl Morlock");

-				bot.label("Name").setFocus();

-			}

-		});

-	}

-

-	private void doActionDateTimeControl(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotDateTime date = bot.dateTime(0);

-				final SWTBotDateTime time = bot.dateTime(1);

-				date.setFocus();

-				date.setDate(new Date());

-				time.setFocus();

-				time.setDate(new Date());

-				date.setFocus();

-			}

-		});

-	}

-

-	private void doActionNumericalControlDouble(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotText text = bot.textWithLabel("Height");

-				text.setFocus();

-				final Locale locale = Locale.getDefault();

-				final NumberFormat formatter = NumberFormat.getInstance(locale);

-				text.setText(formatter.format(1.7d));

-				bot.label("Height").setFocus();

-			}

-		});

-	}

-

-	private void doActionBooleanControl(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotCheckBox check = bot.checkBox();

-				check.setFocus();

-				check.click();

-				bot.label("Is Professional").setFocus();

-			}

-		});

-	}

-

-	private void doActionAttributeMultiControl(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final int addEntryIndex = getFirstButtonIndex(myIndex) + 2;

-				final SWTBotButton addEntry = bot.button(addEntryIndex);

-				addEntry.click();

-				final SWTBotButton delete = bot.button(addEntryIndex + 1);

-				delete.click();

-				bot.label("EMails*").setFocus();

-			}

-		});

-	}

-

-	private void doActionNumericalControlInteger(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotText text = bot.textWithLabel("Number Of Victories");

-				text.setFocus();

-				text.setText(String.valueOf(250));

-				bot.label("Number Of Victories").setFocus();

-			}

-		});

-	}

-

-	private void doActionMultiControlEEnum(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final int addEntryIndex = getFirstButtonIndex(myIndex);

-				final SWTBotButton addEntry = bot.button(addEntryIndex);

-				addEntry.click();

-				final SWTBotButton delete = bot.button(addEntryIndex + 1);

-				delete.click();

-				bot.label("Played Tournament Types").setFocus();

-			}

-		});

-	}

-

-	private void doActionNumericalControlBigDec(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotText text = bot.textWithLabel("Win Loss Ratio");

-				text.setFocus();

-				final Locale locale = Locale.getDefault();

-				final NumberFormat formatter = NumberFormat.getInstance(locale);

-				text.setText(formatter.format(new BigDecimal(0.9)));

-				bot.label("Win Loss Ratio").setFocus();

-			}

-		});

-	}

-

-	private void doActionEEnumControl(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotCombo combo = bot.comboBox("Male");

-				combo.setSelection(0);

-				combo.setSelection(1);

-				bot.label("Gender").setFocus();

-			}

-		});

-	}

-

-	private void doActionReferenceMultiControl(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final SWTBotTable table = bot.table();

-				assertTrue(table.columns().contains("Games"));

-			}

-		});

-	}

-

-	private void doActionLinkControl(final int myIndex) {

-		UIThreadRunnable.syncExec(new VoidResult() {

-			@Override

-			public void run() {

-				final int index = getFirstButtonIndex(myIndex);

-				final SWTBotButton button = bot.button(index + 2);

-				button.click();

-				bot.label("Matchup*").setFocus();

-			}

-		});

-	}

-

-	private int getFirstButtonIndex(int myIndex) {

-		final int[] possibleTextFields = new int[] { 4, 6, 9, 10 };

-		int index = 0;

-		for (final int i : possibleTextFields) {

-			if (i == myIndex) {

-				break;

-			}

-			if (configuration[i]) {

-				switch (i) {

-				case 4:

-				case 6:

-					index = index + 4;

-					break;

-				case 9:

-					index = index + 5;

-					break;

-				default:

-					break;

-				}

-			}

-		}

-		return index;

-	}

-

-	@Override

-	public void assertions(double before, double after) {

-		ControlsSWTBot_PTest.memBefore += before;

-		ControlsSWTBot_PTest.memAfter += after;

-

-		if (getDomainObject() != null) {

-			assertTrue("More than four adapter left on domain model element after dispose of ECPSWTView: "

-				+ getDomainObject().eAdapters().size()

-				+ " adapters. Not all adapters can be removed, but it's maybe time to get suspicious.",

-				getDomainObject()

-					.eAdapters().size() < 5);

-		}

-		// disposeSWTView();

-

-		assertTrue(getSWTViewCollectable().isCollectable());

-		unsetSWTViewCollectable();

-		unsetDomainObject();

-		assertTrue(viewCollectable.isCollectable());

-		viewCollectable = null;

-		assertTrue(domainCollectable.isCollectable());

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest#createDomainObject()

-	 */

-	@Override

-	public EObject createDomainObject() {

-		Game game = (Game) getDomainObject();

-

-		if (isDomainCollectable) {

-			// remove reference to domain object, since gc will be tested

-			unsetDomainObject();

-		}

-

-		if (game == null) {

-			game = BowlingFactory.eINSTANCE.createGame();

-			final Player player = createPlayer();

-			final Matchup matchup = BowlingFactory.eINSTANCE.createMatchup();

-			game.setPlayer(player);

-			matchup.getGames().add(game);

-			final Game game2 = BowlingFactory.eINSTANCE.createGame();

-			matchup.getGames().add(game2);

-			final ResourceSet resourceSet = new ResourceSetImpl();

-			final Resource resource = resourceSet.createResource(URI.createFileURI("foo.xmi"));

-			resource.getContents().add(game);

-			resource.getContents().add(game2);

-			resource.getContents().add(player);

-			resource.getContents().add(matchup);

-			addEditingDomain(resourceSet);

-			memBefore = 0d;

-			memAfter = 0d;

-		} else {

-			game.getPlayer().setName("Max Morlock");

-			game.getPlayer().setHeight(1.8);

-			game.getPlayer().getEMails().clear();

-			game.getPlayer().getEMails().add("maxl@foobar.com");

-			game.getPlayer().setNumberOfVictories(249);

-			game.getPlayer().getPlayedTournamentTypes().clear();

-			game.getPlayer().getPlayedTournamentTypes().add(TournamentType.AMATEUR);

-			game.getPlayer().setWinLossRatio(new BigDecimal(0.8));

-			game.getPlayer().setGender(Gender.MALE);

-			game.setMatchup((Matchup) game.eResource().getContents().get(3));

-			game.getMatchup().getGames().add((Game) game.eResource().getContents().get(1));

-		}

-

-		if (!isDomainCollectable) {

-			setDomainObject(game);

-		}

-

-		domainCollectable = new GCCollectable(game);

-		return game;

-	}

-

-	private Player createPlayer() {

-		final Player player = BowlingFactory.eINSTANCE.createPlayer();

-		player.setName("Max Morlock");

-		final Calendar calendar = Calendar.getInstance();

-		calendar.clear();

-		calendar.set(1925, 5, 11);

-		player.setDateOfBirth(calendar.getTime());

-		player.setHeight(1.80d);

-		player.setIsProfessional(true);

-		player.getEMails().add("maxl@foobar.com");

-		player.setNumberOfVictories(249);

-		player.getPlayedTournamentTypes().add(TournamentType.AMATEUR);

-		player.setWinLossRatio(new BigDecimal(0.8));

-		player.setGender(Gender.MALE);

-		return player;

-	}

-

-	private void addEditingDomain(ResourceSet resourceSet) {

-		AdapterFactory adapterFactory = new ComposedAdapterFactory(

-			ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-		adapterFactory = new ComposedAdapterFactory(new AdapterFactory[] { adapterFactory,

-			new ReflectiveItemProviderAdapterFactory() });

-		final AdapterFactoryEditingDomain domain = new AdapterFactoryEditingDomain(adapterFactory,

-			new BasicCommandStack(), resourceSet);

-		resourceSet.eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));

-	}

-

-	/**

-	 * {@inheritDoc}

-	 *

-	 * @see org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest#createView()

-	 */

-	@Override

-	public VView createView() {

-		final VView view = VViewFactory.eINSTANCE.createView();

-		view.setRootEClass(BowlingPackage.eINSTANCE.getGame());

-		createControls(view);

-		viewCollectable = new GCCollectable(view);

-		return view;

-	}

-

-	// BEGIN COMPLEX CODE

-	private void createControls(VView view) {

-		if (configuration[0]) {

-			createStringControl(view);

-		}

-		if (configuration[1]) {

-			createDateTimeControl(view);

-		}

-		if (configuration[2]) {

-			createNumericalControlDouble(view);

-		}

-		if (configuration[3]) {

-			createBooleanControl(view);

-		}

-		if (configuration[4]) {

-			createAttributeMultiControl(view);

-		}

-		if (configuration[5]) {

-			createNumericalControlInteger(view);

-		}

-		if (configuration[6]) {

-			createMultiControlEEnum(view);

-		}

-		if (configuration[7]) {

-			createNumericalControlBigDec(view);

-		}

-		if (configuration[8]) {

-			createEEnumControl(view);

-		}

-		if (configuration[9]) {

-			createReferenceMultiControl(view);

-		}

-		if (configuration[10]) {

-			createLinkControl(view);

-		}

-	}

-

-	// END COMPLEX CODE

-

-	private void createStringControl(VView view) {

-		final VControl stringControl = VViewFactory.eINSTANCE.createControl();

-		stringControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_Name()));

-		view.getChildren().add(stringControl);

-	}

-

-	private void createDateTimeControl(VView view) {

-		final VControl dateTimeControl = VViewFactory.eINSTANCE.createControl();

-		dateTimeControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_DateOfBirth()));

-		view.getChildren().add(dateTimeControl);

-	}

-

-	private void createNumericalControlDouble(VView view) {

-		final VControl doubleControl = VViewFactory.eINSTANCE.createControl();

-		doubleControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_Height()));

-		view.getChildren().add(doubleControl);

-	}

-

-	private void createBooleanControl(VView view) {

-		final VControl booleanControl = VViewFactory.eINSTANCE.createControl();

-		booleanControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_IsProfessional()));

-		view.getChildren().add(booleanControl);

-	}

-

-	private void createAttributeMultiControl(VView view) {

-		final VControl attributeMultiControl = VViewFactory.eINSTANCE.createControl();

-		attributeMultiControl

-			.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-				.getPlayer_EMails()));

-		view.getChildren().add(attributeMultiControl);

-	}

-

-	private void createNumericalControlInteger(VView view) {

-		final VControl integerControl = VViewFactory.eINSTANCE.createControl();

-		integerControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_NumberOfVictories()));

-		view.getChildren().add(integerControl);

-	}

-

-	private void createMultiControlEEnum(VView view) {

-		final VControl eEnumMultiControl = VViewFactory.eINSTANCE.createControl();

-		eEnumMultiControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_PlayedTournamentTypes()));

-		view.getChildren().add(eEnumMultiControl);

-	}

-

-	private void createNumericalControlBigDec(VView view) {

-		final VControl bigDecControl = VViewFactory.eINSTANCE.createControl();

-		bigDecControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_WinLossRatio()));

-		view.getChildren().add(bigDecControl);

-	}

-

-	private void createEEnumControl(VView view) {

-		final VControl eEnumControl = VViewFactory.eINSTANCE.createControl();

-		eEnumControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE

-			.getPlayer_Gender()));

-		view.getChildren().add(eEnumControl);

-	}

-

-	private void createReferenceMultiControl(VView view) {

-		final VControl referenceMultiControl = VViewFactory.eINSTANCE.createControl();

-		final VFeaturePathDomainModelReference domainModelReference = VViewFactory.eINSTANCE

-			.createFeaturePathDomainModelReference();

-		domainModelReference.setDomainModelEFeature(BowlingPackage.eINSTANCE.getMatchup_Games());

-		domainModelReference.getDomainModelEReferencePath().add(BowlingPackage.eINSTANCE.getGame_Matchup());

-		referenceMultiControl.setDomainModelReference(domainModelReference);

-		view.getChildren().add(referenceMultiControl);

-	}

-

-	private void createLinkControl(VView view) {

-		final VControl linkControl = VViewFactory.eINSTANCE.createControl();

-		final VFeaturePathDomainModelReference domainModelReference = VViewFactory.eINSTANCE

-			.createFeaturePathDomainModelReference();

-		domainModelReference.setDomainModelEFeature(BowlingPackage.eINSTANCE.getGame_Matchup());

-		linkControl.setDomainModelReference(domainModelReference);

-		view.getChildren().add(linkControl);

-	}

-

-	private VFeaturePathDomainModelReference createPlayerVFeaturePathDomainModelReference(EStructuralFeature feature) {

-		final VFeaturePathDomainModelReference domainModelReference = VViewFactory.eINSTANCE

-			.createFeaturePathDomainModelReference();

-		domainModelReference.setDomainModelEFeature(feature);

-		domainModelReference.getDomainModelEReferencePath().add(BowlingPackage.eINSTANCE.getGame_Player());

-		return domainModelReference;

-	}

-

-	private static Collection<Object[]> createConfig(int loopsWithSameDomain, Boolean[] usedControls) {

-		final Collection<Object[]> config = new ArrayList<Object[]>();

-		for (int i = 0; i < loopsWithSameDomain - 1; i++) {

-			config.add(new Object[] { false, usedControls });

-		}

-		config.add(new Object[] { true, usedControls });

-		return config;

-	}

-

-}

+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.ui.editor.test.controls;
+
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VView;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emf.ecp.view.test.common.spi.GCCollectable;
+import org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.emfstore.bowling.BowlingFactory;
+import org.eclipse.emf.emfstore.bowling.BowlingPackage;
+import org.eclipse.emf.emfstore.bowling.Game;
+import org.eclipse.emf.emfstore.bowling.Gender;
+import org.eclipse.emf.emfstore.bowling.Matchup;
+import org.eclipse.emf.emfstore.bowling.Player;
+import org.eclipse.emf.emfstore.bowling.TournamentType;
+import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.VoidResult;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCCombo;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotCheckBox;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotDateTime;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
+import org.junit.AfterClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Configurable SWTBotTest displaying and entering data in ECP Controls.
+ *
+ * @author jfaltermeier
+ *
+ */
+@RunWith(Parameterized.class)
+public class ControlsSWTBot_PTest extends ECPCommonSWTBotTest {
+
+	private static double memBefore;
+	private static double memAfter;
+
+	private final boolean isDomainCollectable;
+	private final Boolean[] configuration;
+
+	private GCCollectable viewCollectable;
+	private GCCollectable domainCollectable;
+
+	public ControlsSWTBot_PTest(boolean isDomainCollectable, Boolean[] b) {
+		this.isDomainCollectable = isDomainCollectable;
+		configuration = b;
+	}
+
+	@Parameters
+	public static Collection<Object[]> data() {
+		final List<Object[]> data = new ArrayList<Object[]>();
+
+		data.addAll(createConfig(25, new Boolean[] { true, false, false, false, false, false, false, false, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, true, false, false, false, false, false, false, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, true, false, false, false, false, false, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, true, false, false, false, false, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, true, false, false, false, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, true, false, false, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, true, false, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, true, false,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, false, true,
+			false, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, false, false,
+			true, false }));
+		data.addAll(createConfig(25, new Boolean[] { false, false, false, false, false, false, false, false, false,
+			false, true }));
+		data.addAll(createConfig(25, new Boolean[] { true, true, true, true, true, true, true, true, true, true, true
+		}));
+
+		return data;
+	}
+
+	@AfterClass
+	public static void afterClass() {
+		final double diff = Math.abs((memBefore - memAfter) / memBefore);
+		assertTrue(diff < 0.05);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest#logic()
+	 */
+	// BEGIN COMPLEX CODE
+	@Override
+	public void logic() {
+		if (configuration[0]) {
+			doActionStringControl(0);
+		}
+		if (configuration[1]) {
+			doActionDateTimeControl(1);
+		}
+		if (configuration[2]) {
+			doActionNumericalControlDouble(2);
+		}
+		if (configuration[3]) {
+			doActionBooleanControl(3);
+		}
+		if (configuration[4]) {
+			doActionAttributeMultiControl(4);
+		}
+		if (configuration[5]) {
+			doActionNumericalControlInteger(5);
+		}
+		if (configuration[6]) {
+			doActionMultiControlEEnum(6);
+		}
+		if (configuration[7]) {
+			doActionNumericalControlBigDec(7);
+		}
+		if (configuration[8]) {
+			doActionEEnumControl(8);
+		}
+		if (configuration[9]) {
+			doActionReferenceMultiControl(9);
+		}
+		if (configuration[10]) {
+			doActionLinkControl(10);
+		}
+	}
+
+	// END COMPLEX CODE
+
+	private void doActionStringControl(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotText text = bot.textWithLabel("Name");
+				text.setFocus();
+				text.setText("Maxl Morlock");
+				bot.label("Name").setFocus();
+			}
+		});
+	}
+
+	private void doActionDateTimeControl(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotDateTime date = bot.dateTime(0);
+				final SWTBotDateTime time = bot.dateTime(1);
+				date.setFocus();
+				date.setDate(new Date());
+				time.setFocus();
+				time.setDate(new Date());
+				date.setFocus();
+			}
+		});
+	}
+
+	private void doActionNumericalControlDouble(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotText text = bot.textWithLabel("Height");
+				text.setFocus();
+				final Locale locale = Locale.getDefault();
+				final NumberFormat formatter = NumberFormat.getInstance(locale);
+				text.setText(formatter.format(1.7d));
+				bot.label("Height").setFocus();
+			}
+		});
+	}
+
+	private void doActionBooleanControl(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotCheckBox check = bot.checkBox();
+				check.setFocus();
+				check.click();
+				bot.label("Is Professional").setFocus();
+			}
+		});
+	}
+
+	private void doActionAttributeMultiControl(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final int addEntryIndex = getFirstButtonIndex(myIndex) + 2;
+				final SWTBotButton addEntry = bot.button(addEntryIndex);
+				addEntry.click();
+				final SWTBotButton delete = bot.button(addEntryIndex + 1);
+				delete.click();
+				bot.label("EMails*").setFocus();
+			}
+		});
+	}
+
+	private void doActionNumericalControlInteger(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotText text = bot.textWithLabel("Number Of Victories");
+				text.setFocus();
+				text.setText(String.valueOf(250));
+				bot.label("Number Of Victories").setFocus();
+			}
+		});
+	}
+
+	private void doActionMultiControlEEnum(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final int addEntryIndex = getFirstButtonIndex(myIndex);
+				final SWTBotButton addEntry = bot.button(addEntryIndex);
+				addEntry.click();
+				final SWTBotButton delete = bot.button(addEntryIndex + 1);
+				delete.click();
+				bot.label("Played Tournament Types").setFocus();
+			}
+		});
+	}
+
+	private void doActionNumericalControlBigDec(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotText text = bot.textWithLabel("Win Loss Ratio");
+				text.setFocus();
+				final Locale locale = Locale.getDefault();
+				final NumberFormat formatter = NumberFormat.getInstance(locale);
+				text.setText(formatter.format(new BigDecimal(0.9)));
+				bot.label("Win Loss Ratio").setFocus();
+			}
+		});
+	}
+
+	private void doActionEEnumControl(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotCCombo combo = bot.ccomboBox("Male");
+				combo.setSelection(0);
+				combo.setSelection(1);
+				bot.label("Gender").setFocus();
+			}
+		});
+	}
+
+	private void doActionReferenceMultiControl(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final SWTBotTable table = bot.table();
+				assertTrue(table.columns().contains("Games"));
+			}
+		});
+	}
+
+	private void doActionLinkControl(final int myIndex) {
+		UIThreadRunnable.syncExec(new VoidResult() {
+			@Override
+			public void run() {
+				final int index = getFirstButtonIndex(myIndex);
+				final SWTBotButton button = bot.button(index + 2);
+				button.click();
+				bot.label("Matchup*").setFocus();
+			}
+		});
+	}
+
+	private int getFirstButtonIndex(int myIndex) {
+		final int[] possibleTextFields = new int[] { 4, 6, 9, 10 };
+		int index = 0;
+		for (final int i : possibleTextFields) {
+			if (i == myIndex) {
+				break;
+			}
+			if (configuration[i]) {
+				switch (i) {
+				case 4:
+				case 6:
+					index = index + 4;
+					break;
+				case 9:
+					index = index + 5;
+					break;
+				default:
+					break;
+				}
+			}
+		}
+		return index;
+	}
+
+	@Override
+	public void assertions(double before, double after) {
+		ControlsSWTBot_PTest.memBefore += before;
+		ControlsSWTBot_PTest.memAfter += after;
+
+		if (getDomainObject() != null) {
+			assertTrue("More than four adapter left on domain model element after dispose of ECPSWTView: "
+				+ getDomainObject().eAdapters().size()
+				+ " adapters. Not all adapters can be removed, but it's maybe time to get suspicious.",
+				getDomainObject()
+					.eAdapters().size() < 5);
+		}
+		// disposeSWTView();
+
+		assertTrue(getSWTViewCollectable().isCollectable());
+		unsetSWTViewCollectable();
+		unsetDomainObject();
+		assertTrue(viewCollectable.isCollectable());
+		viewCollectable = null;
+		assertTrue(domainCollectable.isCollectable());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest#createDomainObject()
+	 */
+	@Override
+	public EObject createDomainObject() {
+		Game game = (Game) getDomainObject();
+
+		if (isDomainCollectable) {
+			// remove reference to domain object, since gc will be tested
+			unsetDomainObject();
+		}
+
+		if (game == null) {
+			game = BowlingFactory.eINSTANCE.createGame();
+			final Player player = createPlayer();
+			final Matchup matchup = BowlingFactory.eINSTANCE.createMatchup();
+			game.setPlayer(player);
+			matchup.getGames().add(game);
+			final Game game2 = BowlingFactory.eINSTANCE.createGame();
+			matchup.getGames().add(game2);
+			final ResourceSet resourceSet = new ResourceSetImpl();
+			final Resource resource = resourceSet.createResource(URI.createFileURI("foo.xmi"));
+			resource.getContents().add(game);
+			resource.getContents().add(game2);
+			resource.getContents().add(player);
+			resource.getContents().add(matchup);
+			addEditingDomain(resourceSet);
+			memBefore = 0d;
+			memAfter = 0d;
+		} else {
+			game.getPlayer().setName("Max Morlock");
+			game.getPlayer().setHeight(1.8);
+			game.getPlayer().getEMails().clear();
+			game.getPlayer().getEMails().add("maxl@foobar.com");
+			game.getPlayer().setNumberOfVictories(249);
+			game.getPlayer().getPlayedTournamentTypes().clear();
+			game.getPlayer().getPlayedTournamentTypes().add(TournamentType.AMATEUR);
+			game.getPlayer().setWinLossRatio(new BigDecimal(0.8));
+			game.getPlayer().setGender(Gender.MALE);
+			game.setMatchup((Matchup) game.eResource().getContents().get(3));
+			game.getMatchup().getGames().add((Game) game.eResource().getContents().get(1));
+		}
+
+		if (!isDomainCollectable) {
+			setDomainObject(game);
+		}
+
+		domainCollectable = new GCCollectable(game);
+		return game;
+	}
+
+	private Player createPlayer() {
+		final Player player = BowlingFactory.eINSTANCE.createPlayer();
+		player.setName("Max Morlock");
+		final Calendar calendar = Calendar.getInstance();
+		calendar.clear();
+		calendar.set(1925, 5, 11);
+		player.setDateOfBirth(calendar.getTime());
+		player.setHeight(1.80d);
+		player.setIsProfessional(true);
+		player.getEMails().add("maxl@foobar.com");
+		player.setNumberOfVictories(249);
+		player.getPlayedTournamentTypes().add(TournamentType.AMATEUR);
+		player.setWinLossRatio(new BigDecimal(0.8));
+		player.setGender(Gender.MALE);
+		return player;
+	}
+
+	private void addEditingDomain(ResourceSet resourceSet) {
+		AdapterFactory adapterFactory = new ComposedAdapterFactory(
+			ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+		adapterFactory = new ComposedAdapterFactory(new AdapterFactory[] { adapterFactory,
+			new ReflectiveItemProviderAdapterFactory() });
+		final AdapterFactoryEditingDomain domain = new AdapterFactoryEditingDomain(adapterFactory,
+			new BasicCommandStack(), resourceSet);
+		resourceSet.eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @see org.eclipse.emf.ecp.view.ui.editor.test.ECPCommonSWTBotTest#createView()
+	 */
+	@Override
+	public VView createView() {
+		final VView view = VViewFactory.eINSTANCE.createView();
+		view.setRootEClass(BowlingPackage.eINSTANCE.getGame());
+		createControls(view);
+		viewCollectable = new GCCollectable(view);
+		return view;
+	}
+
+	// BEGIN COMPLEX CODE
+	private void createControls(VView view) {
+		if (configuration[0]) {
+			createStringControl(view);
+		}
+		if (configuration[1]) {
+			createDateTimeControl(view);
+		}
+		if (configuration[2]) {
+			createNumericalControlDouble(view);
+		}
+		if (configuration[3]) {
+			createBooleanControl(view);
+		}
+		if (configuration[4]) {
+			createAttributeMultiControl(view);
+		}
+		if (configuration[5]) {
+			createNumericalControlInteger(view);
+		}
+		if (configuration[6]) {
+			createMultiControlEEnum(view);
+		}
+		if (configuration[7]) {
+			createNumericalControlBigDec(view);
+		}
+		if (configuration[8]) {
+			createEEnumControl(view);
+		}
+		if (configuration[9]) {
+			createReferenceMultiControl(view);
+		}
+		if (configuration[10]) {
+			createLinkControl(view);
+		}
+	}
+
+	// END COMPLEX CODE
+
+	private void createStringControl(VView view) {
+		final VControl stringControl = VViewFactory.eINSTANCE.createControl();
+		stringControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_Name()));
+		view.getChildren().add(stringControl);
+	}
+
+	private void createDateTimeControl(VView view) {
+		final VControl dateTimeControl = VViewFactory.eINSTANCE.createControl();
+		dateTimeControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_DateOfBirth()));
+		view.getChildren().add(dateTimeControl);
+	}
+
+	private void createNumericalControlDouble(VView view) {
+		final VControl doubleControl = VViewFactory.eINSTANCE.createControl();
+		doubleControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_Height()));
+		view.getChildren().add(doubleControl);
+	}
+
+	private void createBooleanControl(VView view) {
+		final VControl booleanControl = VViewFactory.eINSTANCE.createControl();
+		booleanControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_IsProfessional()));
+		view.getChildren().add(booleanControl);
+	}
+
+	private void createAttributeMultiControl(VView view) {
+		final VControl attributeMultiControl = VViewFactory.eINSTANCE.createControl();
+		attributeMultiControl
+			.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+				.getPlayer_EMails()));
+		view.getChildren().add(attributeMultiControl);
+	}
+
+	private void createNumericalControlInteger(VView view) {
+		final VControl integerControl = VViewFactory.eINSTANCE.createControl();
+		integerControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_NumberOfVictories()));
+		view.getChildren().add(integerControl);
+	}
+
+	private void createMultiControlEEnum(VView view) {
+		final VControl eEnumMultiControl = VViewFactory.eINSTANCE.createControl();
+		eEnumMultiControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_PlayedTournamentTypes()));
+		view.getChildren().add(eEnumMultiControl);
+	}
+
+	private void createNumericalControlBigDec(VView view) {
+		final VControl bigDecControl = VViewFactory.eINSTANCE.createControl();
+		bigDecControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_WinLossRatio()));
+		view.getChildren().add(bigDecControl);
+	}
+
+	private void createEEnumControl(VView view) {
+		final VControl eEnumControl = VViewFactory.eINSTANCE.createControl();
+		eEnumControl.setDomainModelReference(createPlayerVFeaturePathDomainModelReference(BowlingPackage.eINSTANCE
+			.getPlayer_Gender()));
+		view.getChildren().add(eEnumControl);
+	}
+
+	private void createReferenceMultiControl(VView view) {
+		final VControl referenceMultiControl = VViewFactory.eINSTANCE.createControl();
+		final VFeaturePathDomainModelReference domainModelReference = VViewFactory.eINSTANCE
+			.createFeaturePathDomainModelReference();
+		domainModelReference.setDomainModelEFeature(BowlingPackage.eINSTANCE.getMatchup_Games());
+		domainModelReference.getDomainModelEReferencePath().add(BowlingPackage.eINSTANCE.getGame_Matchup());
+		referenceMultiControl.setDomainModelReference(domainModelReference);
+		view.getChildren().add(referenceMultiControl);
+	}
+
+	private void createLinkControl(VView view) {
+		final VControl linkControl = VViewFactory.eINSTANCE.createControl();
+		final VFeaturePathDomainModelReference domainModelReference = VViewFactory.eINSTANCE
+			.createFeaturePathDomainModelReference();
+		domainModelReference.setDomainModelEFeature(BowlingPackage.eINSTANCE.getGame_Matchup());
+		linkControl.setDomainModelReference(domainModelReference);
+		view.getChildren().add(linkControl);
+	}
+
+	private VFeaturePathDomainModelReference createPlayerVFeaturePathDomainModelReference(EStructuralFeature feature) {
+		final VFeaturePathDomainModelReference domainModelReference = VViewFactory.eINSTANCE
+			.createFeaturePathDomainModelReference();
+		domainModelReference.setDomainModelEFeature(feature);
+		domainModelReference.getDomainModelEReferencePath().add(BowlingPackage.eINSTANCE.getGame_Player());
+		return domainModelReference;
+	}
+
+	private static Collection<Object[]> createConfig(int loopsWithSameDomain, Boolean[] usedControls) {
+		final Collection<Object[]> config = new ArrayList<Object[]>();
+		for (int i = 0; i < loopsWithSameDomain - 1; i++) {
+			config.add(new Object[] { false, usedControls });
+		}
+		config.add(new Object[] { true, usedControls });
+		return config;
+	}
+
+}
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
index 08f3e0d207..5fbcd37237 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: View Model Unset Service Test
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.unset;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.unset;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
index b4e3280eba..31d85d6cb2 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.unset.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
index c39892aa8b..998b0e7d27 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .,
  lib/commons-beanutils-1.9.2.jar,
  lib/commons-lang3-3.3.2.jar,
  lib/org.apache.bval.bundle-0.5.jar
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: car;version="1.12.0";x-internal:=true,
- car.impl;version="1.12.0";x-internal:=true,
- car.util;version="1.12.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean.test;version="1.12.0";x-internal:=true
+Export-Package: car;version="1.13.0";x-internal:=true,
+ car.impl;version="1.13.0";x-internal:=true,
+ car.util;version="1.13.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean.test;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
index b880a562aa..cfc0d65fd1 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.validation.bean.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.test.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 5d784aa32f..0000000000
--- a/tests/org.eclipse.emf.ecp.view.validation.test.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.test.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.emf.ecp.view.validation.test.model.provider.TestEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.5
-Export-Package: org.eclipse.emf.ecp.view.validation.test.model.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecp.view.validation.test;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/AllValidationTests.launch b/tests/org.eclipse.emf.ecp.view.validation.test/AllValidationTests.launch
index a9a1cd5e13..4ec338d69f 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/AllValidationTests.launch
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/AllValidationTests.launch
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="false"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="false"/>

-<booleanAttribute key="includeOptional" value="false"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.ecp.view.validation.test.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.ecp.view.validation.test"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.emf.cdo.server.product.tcp_h2"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>

-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.test.common@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view.test@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.custom.model@default:default,org.eclipse.emf.ecp.view.indexdmr.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.validation@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.test.common.swt@default:default,org.eclipse.emf.ecp.view.test.common@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation.test@default:false,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.index@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core@default:default"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="false"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.ecp.view.validation.test.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.ecp.view.validation.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.emf.cdo.server.product.tcp_h2"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common.test@default:false,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core.test@default:false,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt.test@default:false,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.ecp.test.common@default:default,org.eclipse.emf.ecp.test.model@default:default,org.eclipse.emf.ecp.ui.view.swt.test@default:false,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view.test@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.view.context.tests@default:false,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.core.swt.tests@default:false,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.custom.model@default:default,org.eclipse.emf.ecp.view.indexdmr.model@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common.test@default:false,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit.test@default:false,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi.test@default:false,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model.test@default:false,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model.test@default:false,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.validation@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service.test@default:false,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.test.common.swt@default:default,org.eclipse.emf.ecp.view.test.common@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation.test@default:false,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common.databinding@default:default,org.eclipse.emfforms.common.tests@default:false,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath.tests@default:false,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.index.tests@default:false,org.eclipse.emfforms.core.services.databinding.index@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.domainexpander.default.tests@default:false,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf.tests@default:false,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy.tests@default:false,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services.tests@default:false,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization.tests@default:false,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.tests@default:false,org.eclipse.emfforms.swt.core@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="false"/>
+</launchConfiguration>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
index 10eb0ae39b..e782ecc154 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
@@ -2,29 +2,30 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.test;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.12.0",
- org.eclipse.emf.ecp.view.validation.test.model;version="1.12.0",
- org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.12.0",
- org.eclipse.emf.ecp.view.validation.test.model.util;version="1.12.0"
+Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.13.0",
+ org.eclipse.emf.ecp.view.validation.test.model;version="1.13.0",
+ org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.13.0",
+ org.eclipse.emf.ecp.view.validation.test.model.util;version="1.13.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/model/test.ecore b/tests/org.eclipse.emf.ecp.view.validation.test/model/test.ecore
index edce9894b0..a15221fbcd 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/model/test.ecore
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/model/test.ecore
@@ -19,6 +19,7 @@
         eType="#//Book" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="librarian" eType="#//Librarian"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="phoneNumber" eType="#//PhoneNumber"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Writer">
     <eOperations name="validate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -40,6 +41,8 @@
         defaultValueLiteral="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="library" eType="#//Library"
         eOpposite="#//Library/writers"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="initials" eType="#//MinLengthOf3"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="#//StrictMinLengthOf3"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Book">
     <eOperations name="validate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -75,6 +78,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="powerBlock" eType="#//PowerBlock"
         containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="colors" upperBound="-1"
+        eType="#//Color"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Mainboard">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
@@ -139,4 +144,55 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="singleParent" eType="#//CrossReferenceContainer"
         eOpposite="#//CrossReferenceContainer/singleContent"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Person">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" eType="#//StringWithMaxLength8"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="gender" eType="#//Gender"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" eType="#//OnlyCapitals"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="custom" eType="#//CustomDataType"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="age" eType="#//Age"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="StringWithMaxLength8" instanceClassName="java.lang.String">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="maxLength" value="8"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Gender">
+    <eLiterals name="Male"/>
+    <eLiterals name="Female" value="1" literal="Female"/>
+    <eLiterals name="Both" value="2" literal="Both"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="OnlyCapitals" instanceClassName="java.lang.String">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="pattern" value="[A-Z]+"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="CustomDataType" instanceClassName="java.lang.String"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="PhoneNumber" instanceClassName="java.lang.String">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="pattern" value="((\+)?[a-c0-9*#]{1,20}){0,1}"/>
+      <details key="loosePattern" value="[+0-9]+"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="MinLengthOf3" instanceClassName="java.lang.String">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="minLength" value="3"/>
+      <details key="looseMinLength" value="0"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="StrictMinLengthOf3" instanceClassName="java.lang.String">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="minLength" value="3"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EDataType" name="Age" instanceClassName="java.lang.Integer">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="minInclusive" value="0"/>
+      <details key="maxInclusive" value="100"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Color">
+    <eLiterals name="Red" literal=""/>
+    <eLiterals name="Green" value="1"/>
+    <eLiterals name="Blue" value="2"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/model/test.genmodel b/tests/org.eclipse.emf.ecp.view.validation.test/model/test.genmodel
index d82a79b08c..fe7730f6dd 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/model/test.genmodel
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/model/test.genmodel
@@ -1,99 +1,135 @@
-<?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-2014 EclipseSource Muenchen GmbH and others.&#xD;&#xA;&#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;Eugen Neufeld - initial API and implementation"

-    modelDirectory="/org.eclipse.emf.ecp.view.validation.test/src" modelPluginID="org.eclipse.emf.ecp.view.validation.test"

-    modelName="Test" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"

-    copyrightFields="false" classNamePattern="">

-  <foreignModel>test.ecore</foreignModel>

-  <genPackages prefix="Test" basePackage="org.eclipse.emf.ecp.view.validation.test"

-      disposableProviderFactory="true" ecorePackage="test.ecore#/">

-    <genClasses ecoreClass="test.ecore#//Library">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Library/name"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Library/writers"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Library/books"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Library/librarian"/>

-      <genOperations ecoreOperation="test.ecore#//Library/validate">

-        <genParameters ecoreParameter="test.ecore#//Library/validate/diagnostic"/>

-        <genParameters ecoreParameter="test.ecore#//Library/validate/context"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Writer">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/firstName"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/lastName"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/EMail"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/BirthDate"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference test.ecore#//Writer/books"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/Pseudonym"/>

-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference test.ecore#//Writer/library"/>

-      <genOperations ecoreOperation="test.ecore#//Writer/validate">

-        <genParameters ecoreParameter="test.ecore#//Writer/validate/diagnostic"/>

-        <genParameters ecoreParameter="test.ecore#//Writer/validate/context"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Book">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Book/title"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Book/pages"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference test.ecore#//Book/writers"/>

-      <genOperations ecoreOperation="test.ecore#//Book/validate">

-        <genParameters ecoreParameter="test.ecore#//Book/validate/diagnostic"/>

-        <genParameters ecoreParameter="test.ecore#//Book/validate/context"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Librarian">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Librarian/name"/>

-      <genOperations ecoreOperation="test.ecore#//Librarian/validate">

-        <genParameters ecoreParameter="test.ecore#//Librarian/validate/diagnostic"/>

-        <genParameters ecoreParameter="test.ecore#//Librarian/validate/context"/>

-      </genOperations>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Computer">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Computer/mainboard"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Computer/name"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Computer/powerBlock"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Mainboard">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Mainboard/name"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//PowerBlock">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//PowerBlock/name"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Container">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Container/contents"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Content">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Content/uniqueAttribute"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Content/secondAttribute"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//TableWithMultiplicity">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithMultiplicity/content"/>

-    </genClasses>

-    <genClasses image="false" ecoreClass="test.ecore#//TableContent"/>

-    <genClasses ecoreClass="test.ecore#//TableContentWithoutValidation">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithoutValidation/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithoutValidation/weight"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//TableContentWithValidation">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithValidation/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithValidation/weight"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//TableWithoutMultiplicity">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithoutMultiplicity/content"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//TableWithUnique">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithUnique/content"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//TableContentWithInnerChild2">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableContentWithInnerChild2/innerChild"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//TableContentWithInnerChild">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableContentWithInnerChild/innerChild"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithInnerChild/stuff"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//TableWithoutMultiplicityConcrete">

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithoutMultiplicityConcrete/content"/>

-    </genClasses>

-    <genClasses ecoreClass="test.ecore#//Referencer">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference test.ecore#//Referencer/referencedContent"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

+<?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-2014 EclipseSource Muenchen GmbH and others.&#xD;&#xA;&#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;Eugen Neufeld - initial API and implementation"
+    modelDirectory="/org.eclipse.emf.ecp.view.validation.test/src" modelPluginID="org.eclipse.emf.ecp.view.validation.test"
+    modelName="Test" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
+    copyrightFields="false" classNamePattern="">
+  <foreignModel>test.ecore</foreignModel>
+  <genPackages prefix="Test" basePackage="org.eclipse.emf.ecp.view.validation.test"
+      disposableProviderFactory="true" ecorePackage="test.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="test.ecore#//Gender">
+      <genEnumLiterals ecoreEnumLiteral="test.ecore#//Gender/Male"/>
+      <genEnumLiterals ecoreEnumLiteral="test.ecore#//Gender/Female"/>
+      <genEnumLiterals ecoreEnumLiteral="test.ecore#//Gender/Both"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="test.ecore#//Color">
+      <genEnumLiterals ecoreEnumLiteral="test.ecore#//Color/Red"/>
+      <genEnumLiterals ecoreEnumLiteral="test.ecore#//Color/Green"/>
+      <genEnumLiterals ecoreEnumLiteral="test.ecore#//Color/Blue"/>
+    </genEnums>
+    <genDataTypes ecoreDataType="test.ecore#//StringWithMaxLength8"/>
+    <genDataTypes ecoreDataType="test.ecore#//OnlyCapitals"/>
+    <genDataTypes ecoreDataType="test.ecore#//CustomDataType"/>
+    <genDataTypes ecoreDataType="test.ecore#//PhoneNumber"/>
+    <genDataTypes ecoreDataType="test.ecore#//MinLengthOf3"/>
+    <genDataTypes ecoreDataType="test.ecore#//StrictMinLengthOf3"/>
+    <genDataTypes ecoreDataType="test.ecore#//Age"/>
+    <genClasses ecoreClass="test.ecore#//Library">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Library/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Library/writers"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Library/books"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Library/librarian"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Library/phoneNumber"/>
+      <genOperations ecoreOperation="test.ecore#//Library/validate">
+        <genParameters ecoreParameter="test.ecore#//Library/validate/diagnostic"/>
+        <genParameters ecoreParameter="test.ecore#//Library/validate/context"/>
+      </genOperations>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Writer">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/firstName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/lastName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/EMail"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/BirthDate"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference test.ecore#//Writer/books"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/Pseudonym"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference test.ecore#//Writer/library"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/initials"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Writer/title"/>
+      <genOperations ecoreOperation="test.ecore#//Writer/validate">
+        <genParameters ecoreParameter="test.ecore#//Writer/validate/diagnostic"/>
+        <genParameters ecoreParameter="test.ecore#//Writer/validate/context"/>
+      </genOperations>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Book">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Book/title"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Book/pages"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference test.ecore#//Book/writers"/>
+      <genOperations ecoreOperation="test.ecore#//Book/validate">
+        <genParameters ecoreParameter="test.ecore#//Book/validate/diagnostic"/>
+        <genParameters ecoreParameter="test.ecore#//Book/validate/context"/>
+      </genOperations>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Librarian">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Librarian/name"/>
+      <genOperations ecoreOperation="test.ecore#//Librarian/validate">
+        <genParameters ecoreParameter="test.ecore#//Librarian/validate/diagnostic"/>
+        <genParameters ecoreParameter="test.ecore#//Librarian/validate/context"/>
+      </genOperations>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Computer">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Computer/mainboard"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Computer/name"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Computer/powerBlock"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Computer/colors"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Mainboard">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Mainboard/name"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//PowerBlock">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//PowerBlock/name"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Container">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//Container/contents"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Content">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Content/uniqueAttribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Content/secondAttribute"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//TableWithMultiplicity">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithMultiplicity/content"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="test.ecore#//TableContent"/>
+    <genClasses ecoreClass="test.ecore#//TableContentWithoutValidation">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithoutValidation/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithoutValidation/weight"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//TableContentWithValidation">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithValidation/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithValidation/weight"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//TableWithoutMultiplicity">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithoutMultiplicity/content"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//TableWithUnique">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithUnique/content"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//TableContentWithInnerChild2">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableContentWithInnerChild2/innerChild"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//TableContentWithInnerChild">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableContentWithInnerChild/innerChild"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//TableContentWithInnerChild/stuff"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//TableWithoutMultiplicityConcrete">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//TableWithoutMultiplicityConcrete/content"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Referencer">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference test.ecore#//Referencer/referencedContent"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//CrossReferenceContainer">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//CrossReferenceContainer/contents"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference test.ecore#//CrossReferenceContainer/singleContent"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//CrossReferenceContent">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference test.ecore#//CrossReferenceContent/parent"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference test.ecore#//CrossReferenceContent/singleParent"/>
+    </genClasses>
+    <genClasses ecoreClass="test.ecore#//Person">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Person/firstName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Person/gender"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Person/lastName"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Person/custom"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute test.ecore#//Person/age"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
index eb5451646a..5ab6ac52fc 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.validation.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/AllTests.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/AllTests.java
index b66e92ae59..88a0e57236 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/AllTests.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/AllTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -7,7 +7,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- * Jonas - initial API and implementation
+ * Jonas Helming - initial API and implementation
  ******************************************************************************/
 package org.eclipse.emf.ecp.view.validation.test;
 
@@ -25,7 +25,8 @@ import org.junit.runners.Suite.SuiteClasses;
 	SubstitutionLabel_PTest.class,
 	TableValidation_PTest.class,
 	ValidationPerformance_ITest.class,
-	DynamicDMR_PTest.class
+	DynamicDMR_PTest.class,
+	PreSetValidationService_Test.class
 })
 public class AllTests {
 
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/PreSetValidationService_Test.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/PreSetValidationService_Test.java
new file mode 100644
index 0000000000..d981cbb5d6
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/PreSetValidationService_Test.java
@@ -0,0 +1,199 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.validation.test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.view.validation.test.model.Color;
+import org.eclipse.emf.ecp.view.validation.test.model.Gender;
+import org.eclipse.emf.ecp.view.validation.test.model.TestPackage;
+import org.eclipse.emfforms.internal.common.prevalidation.PreSetValidationServiceImpl;
+import org.eclipse.emfforms.spi.common.validation.IFeatureConstraint;
+import org.junit.Test;
+
+public class PreSetValidationService_Test {
+
+	private final PreSetValidationServiceImpl service = new PreSetValidationServiceImpl();
+
+	@Test
+	public void violateMaxLength() {
+		final Diagnostic result = service.validate(
+			TestPackage.eINSTANCE.getPerson_FirstName(),
+			"more than 10 chars",
+			null);
+		assertEquals(result.getSeverity(), Diagnostic.ERROR);
+	}
+
+	@Test
+	public void maxLength() {
+		final Diagnostic result = service.validate(
+			TestPackage.eINSTANCE.getPerson_FirstName(),
+			"valid",
+			null);
+		assertEquals(result.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void enums() {
+		final Diagnostic result = service.validate(
+			TestPackage.eINSTANCE.getPerson_Gender(),
+			Gender.MALE,
+			null);
+		assertEquals(result.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void pattern() {
+		final Diagnostic result = service.validate(
+			TestPackage.eINSTANCE.getPerson_LastName(), "VALID", null);
+		assertEquals(result.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void invalidPattern() {
+		final Diagnostic result = service.validate(
+			TestPackage.eINSTANCE.getPerson_LastName(), "invalid", null);
+		assertEquals(result.getSeverity(), Diagnostic.ERROR);
+	}
+
+	@Test
+	public void validEnum() {
+		final Diagnostic result = service.validate(TestPackage.eINSTANCE.getPerson_Gender(), "Male", null);
+		assertEquals(result.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void invalidEnum() {
+		final Diagnostic result = service.validate(TestPackage.eINSTANCE.getPerson_Gender(), "Mal", null);
+		assertEquals(result.getSeverity(), Diagnostic.ERROR);
+	}
+
+	@Test
+	public void custom() {
+		final PreSetValidationServiceImpl s = new PreSetValidationServiceImpl();
+		s.addConstraintValidator(TestPackage.eINSTANCE.getCustomDataType(), new IFeatureConstraint() {
+			@Override
+			public Diagnostic validate(EStructuralFeature eStructuralFeature, Object value,
+				Map<Object, Object> context) {
+				final EClassifier eType = eStructuralFeature.getEType();
+
+				if (!TestPackage.eINSTANCE.getCustomDataType().isInstance(eType)
+					|| value.equals("FOO")) {
+					return new BasicDiagnostic();
+				}
+
+				return BasicDiagnostic.toDiagnostic(
+					new Status(IStatus.ERROR, "", IStatus.ERROR, "Value is not FOO", null));
+			}
+		});
+
+		final Diagnostic result = s.validate(
+			TestPackage.eINSTANCE.getPerson_Custom(), "FOO", null);
+		assertEquals(result.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void invalidCustom() {
+		final PreSetValidationServiceImpl s = new PreSetValidationServiceImpl();
+		s.addConstraintValidator(TestPackage.eINSTANCE.getCustomDataType(), new IFeatureConstraint() {
+			@Override
+			public Diagnostic validate(EStructuralFeature eStructuralFeature, Object value,
+				Map<Object, Object> context) {
+
+				if (value.equals("FOO")) {
+					return new BasicDiagnostic();
+				}
+
+				return BasicDiagnostic.toDiagnostic(
+					new Status(IStatus.ERROR, "test", IStatus.ERROR, "Value is not FOO", null));
+			}
+		});
+
+		final Diagnostic result = s.validate(
+			TestPackage.eINSTANCE.getPerson_Custom(), "BAR", null);
+		assertEquals(result.getSeverity(), Diagnostic.ERROR);
+	}
+
+	@Test
+	public void loosePhoneNumberPattern() {
+		final Diagnostic result = service.validateLoose(TestPackage.eINSTANCE.getLibrary_PhoneNumber(), "+");
+		assertEquals(result.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void strictPhoneNumberPattern() {
+		final Diagnostic invalid = service.validate(TestPackage.eINSTANCE.getLibrary_PhoneNumber(), "+", null);
+		final Diagnostic valid = service.validate(TestPackage.eINSTANCE.getLibrary_PhoneNumber(), "+123", null);
+		assertEquals(invalid.getSeverity(), Diagnostic.ERROR);
+		assertEquals(valid.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void looseMinLength() {
+		final Diagnostic result = service.validateLoose(TestPackage.eINSTANCE.getWriter_Initials(), "");
+		assertEquals(result.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void strictMinLength() {
+		// min length of three
+		final Diagnostic invalid = service.validate(TestPackage.eINSTANCE.getWriter_Initials(), "", null);
+		final Diagnostic valid = service.validate(TestPackage.eINSTANCE.getWriter_Initials(), "foo", null);
+		assertEquals(invalid.getSeverity(), Diagnostic.ERROR);
+		assertEquals(valid.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void looseMinLengthFallsBackToStrict() {
+		// title has no looseMinLength set
+		final Diagnostic invalid = service.validateLoose(TestPackage.eINSTANCE.getWriter_Title(), "");
+		assertEquals(invalid.getSeverity(), Diagnostic.ERROR);
+	}
+
+	@Test
+	public void strictMinInclusive() {
+		// min length of three
+		final Diagnostic invalid = service.validate(TestPackage.eINSTANCE.getPerson_Age(), Integer.valueOf(-1), null);
+		final Diagnostic minValid = service.validate(TestPackage.eINSTANCE.getPerson_Age(), Integer.valueOf(0), null);
+		final Diagnostic maxValid = service.validate(TestPackage.eINSTANCE.getPerson_Age(), Integer.valueOf(100), null);
+		assertEquals(invalid.getSeverity(), Diagnostic.ERROR);
+		assertEquals(minValid.getSeverity(), Diagnostic.OK);
+		assertEquals(maxValid.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void looseMinInclusive() {
+		// min length of three
+		final Diagnostic invalid = service.validateLoose(TestPackage.eINSTANCE.getPerson_Age(), Integer.valueOf(-1));
+		final Diagnostic minValid = service.validateLoose(TestPackage.eINSTANCE.getPerson_Age(), Integer.valueOf(0));
+		final Diagnostic maxValid = service.validateLoose(TestPackage.eINSTANCE.getPerson_Age(), Integer.valueOf(100));
+		assertEquals(invalid.getSeverity(), Diagnostic.ERROR);
+		assertEquals(minValid.getSeverity(), Diagnostic.OK);
+		assertEquals(maxValid.getSeverity(), Diagnostic.OK);
+	}
+
+	@Test
+	public void multiEnum() {
+		final Diagnostic valid = service.validate(TestPackage.eINSTANCE.getComputer_Colors(),
+			Arrays.asList(Color.GREEN, Color.BLUE), null);
+		assertEquals(valid.getSeverity(), Diagnostic.OK);
+	}
+}
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java
index 53b51b801d..ff5fb5b671 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationService_PTest.java
@@ -15,6 +15,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -33,9 +34,15 @@ import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent;
 import org.eclipse.emf.ecp.view.validation.test.model.TestFactory;
 import org.eclipse.emf.ecp.view.validation.test.model.TestPackage;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.common.report.ReportServiceConsumer;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 
 /**
  * @author Stefan Dirix
@@ -53,6 +60,8 @@ public class ValidationService_PTest {
 
 	private CrossReferenceContainer otherContainer;
 
+	private ReportService reportService;
+
 	/**
 	 * @throws java.lang.Exception
 	 */
@@ -187,4 +196,103 @@ public class ValidationService_PTest {
 		assertTrue(called.get(0));
 	}
 
+	@Test
+	public void testValidationTimeoutReport2000() {
+		setupContent();
+		container.getContents().add(content);
+		final ReportService reportService = getReportService();
+
+		final List<Boolean> called = new ArrayList<Boolean>(1);
+		called.add(false);
+		reportService.addConsumer(new ReportServiceConsumer() {
+
+			@Override
+			public void reported(AbstractReport reportEntity) {
+				assertTrue(reportEntity.getMessage().startsWith("Validation took longer than expected for"));
+				called.set(0, true);
+			}
+		});
+		validationService.addValidationProvider(new ValidationProvider() {
+			@Override
+			public List<Diagnostic> validate(EObject eObject) {
+				try {
+					Thread.sleep(3000);
+				} catch (final InterruptedException ex) {
+				}
+				return Collections.emptyList();
+			}
+		});
+
+		validationService.validate(Arrays.asList(content.eContainer()));
+		assertTrue("Validation report missing", called.get(0));
+	}
+
+	@Test
+	public void testValidationTimeoutReport1000() {
+		setupContent();
+		container.getContents().add(content);
+		final ReportService reportService = getReportService();
+
+		final List<Boolean> called = new ArrayList<Boolean>(1);
+		called.add(false);
+		reportService.addConsumer(new ReportServiceConsumer() {
+
+			@Override
+			public void reported(AbstractReport reportEntity) {
+				assertTrue(reportEntity.getMessage().startsWith("Validation took longer than expected for"));
+				called.set(0, true);
+
+			}
+		});
+		validationService.addValidationProvider(new ValidationProvider() {
+			@Override
+			public List<Diagnostic> validate(EObject eObject) {
+				try {
+					Thread.sleep(1000);
+				} catch (final InterruptedException ex) {
+				}
+				return Collections.emptyList();
+			}
+		});
+
+		validationService.validate(Arrays.asList(content.eContainer()));
+		assertTrue("Validation report missing", called.get(0));
+	}
+
+	@Test
+	public void testValidationTimeoutReportNoDelay() {
+		setupContent();
+		container.getContents().add(content);
+		final ReportService reportService = getReportService();
+
+		final List<Boolean> called = new ArrayList<Boolean>(1);
+		called.add(false);
+		reportService.addConsumer(new ReportServiceConsumer() {
+
+			@Override
+			public void reported(AbstractReport reportEntity) {
+				assertTrue(reportEntity.getMessage().startsWith("Validation took longer than expected for"));
+				called.set(0, true);
+
+			}
+		});
+		validationService.addValidationProvider(new ValidationProvider() {
+			@Override
+			public List<Diagnostic> validate(EObject eObject) {
+				return Collections.emptyList();
+			}
+		});
+
+		validationService.validate(Arrays.asList(content.eContainer()));
+		assertFalse("Validation report present", called.get(0));
+	}
+
+	private ReportService getReportService() {
+		final BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+		final ServiceReference<ReportService> serviceReference = bundleContext.getServiceReference(ReportService.class);
+		final ReportService service = bundleContext.getService(serviceReference);
+		bundleContext.ungetService(serviceReference);
+		return service;
+	}
+
 }
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Color.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Color.java
new file mode 100644
index 0000000000..e72fbe2ef0
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Color.java
@@ -0,0 +1,275 @@
+/**
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.validation.test.model;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Color</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getColor()
+ * @model
+ * @generated
+ */
+public enum Color implements Enumerator {
+	/**
+	 * The '<em><b>Red</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #RED_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	RED(0, "Red", ""),
+
+	/**
+	 * The '<em><b>Green</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #GREEN_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	GREEN(1, "Green", "Green"),
+
+	/**
+	 * The '<em><b>Blue</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #BLUE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BLUE(2, "Blue", "Blue");
+
+	/**
+	 * The '<em><b>Red</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Red</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #RED
+	 * @model name="Red" literal=""
+	 * @generated
+	 * @ordered
+	 */
+	public static final int RED_VALUE = 0;
+
+	/**
+	 * The '<em><b>Green</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Green</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #GREEN
+	 * @model name="Green"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int GREEN_VALUE = 1;
+
+	/**
+	 * The '<em><b>Blue</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Blue</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #BLUE
+	 * @model name="Blue"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BLUE_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Color</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static final Color[] VALUES_ARRAY = new Color[] {
+		RED,
+		GREEN,
+		BLUE,
+	};
+
+	/**
+	 * A public read-only list of all the '<em><b>Color</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final List<Color> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Color</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Color get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			final Color result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Color</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Color getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			final Color result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Color</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Color get(int value) {
+		switch (value) {
+		case RED_VALUE:
+			return RED;
+		case GREEN_VALUE:
+			return GREEN;
+		case BLUE_VALUE:
+			return BLUE;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private Color(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+		return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+
+} // Color
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Computer.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Computer.java
index 39c6d81bff..c59a29e231 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Computer.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Computer.java
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.eclipse.emf.ecp.view.validation.test.model;
 
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -25,6 +26,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getMainboard <em>Mainboard</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getPowerBlock <em>Power Block</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getColors <em>Colors</em>}</li>
  * </ul>
  *
  * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getComputer()
@@ -40,7 +42,7 @@ public interface Computer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Mainboard</em>' containment reference.
 	 * @see #setMainboard(Mainboard)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getComputer_Mainboard()
@@ -54,7 +56,7 @@ public interface Computer extends EObject {
 	 * <em>Mainboard</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Mainboard</em>' containment reference.
 	 * @see #getMainboard()
 	 * @generated
@@ -68,7 +70,7 @@ public interface Computer extends EObject {
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getComputer_Name()
@@ -82,7 +84,7 @@ public interface Computer extends EObject {
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
@@ -97,7 +99,7 @@ public interface Computer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Power Block</em>' containment reference.
 	 * @see #setPowerBlock(PowerBlock)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getComputer_PowerBlock()
@@ -107,15 +109,34 @@ public interface Computer extends EObject {
 	PowerBlock getPowerBlock();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getPowerBlock
-	 * <em>Power Block</em>}' containment reference.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getPowerBlock <em>Power
+	 * Block</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Power Block</em>' containment reference.
 	 * @see #getPowerBlock()
 	 * @generated
 	 */
 	void setPowerBlock(PowerBlock value);
 
+	/**
+	 * Returns the value of the '<em><b>Colors</b></em>' attribute list.
+	 * The list contents are of type {@link org.eclipse.emf.ecp.view.validation.test.model.Color}.
+	 * The literals are from the enumeration {@link org.eclipse.emf.ecp.view.validation.test.model.Color}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Colors</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Colors</em>' attribute list.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Color
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getComputer_Colors()
+	 * @model
+	 * @generated
+	 */
+	EList<Color> getColors();
+
 } // Computer
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Gender.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Gender.java
new file mode 100644
index 0000000000..fc448f7d9d
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Gender.java
@@ -0,0 +1,274 @@
+/**
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.validation.test.model;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Gender</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getGender()
+ * @model
+ * @generated
+ */
+public enum Gender implements Enumerator {
+	/**
+	 * The '<em><b>Male</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #MALE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MALE(0, "Male", "Male"),
+
+	/**
+	 * The '<em><b>Female</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #FEMALE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	FEMALE(1, "Female", "Female"),
+	/**
+	 * The '<em><b>Both</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #BOTH_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	BOTH(2, "Both", "Both");
+
+	/**
+	 * The '<em><b>Male</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Male</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #MALE
+	 * @model name="Male"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MALE_VALUE = 0;
+
+	/**
+	 * The '<em><b>Female</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Female</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #FEMALE
+	 * @model name="Female"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int FEMALE_VALUE = 1;
+
+	/**
+	 * The '<em><b>Both</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Both</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #BOTH
+	 * @model name="Both"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int BOTH_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Gender</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private static final Gender[] VALUES_ARRAY = new Gender[] {
+		MALE,
+		FEMALE,
+		BOTH,
+	};
+
+	/**
+	 * A public read-only list of all the '<em><b>Gender</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public static final List<Gender> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Gender</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Gender get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			final Gender result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Gender</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Gender getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			final Gender result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Gender</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
+	 * @generated
+	 */
+	public static Gender get(int value) {
+		switch (value) {
+		case MALE_VALUE:
+			return MALE;
+		case FEMALE_VALUE:
+			return FEMALE;
+		case BOTH_VALUE:
+			return BOTH;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private Gender(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public int getValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getLiteral() {
+		return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+
+} // Gender
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Library.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Library.java
index db3dc8ffb4..d8e03da3ff 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Library.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Library.java
@@ -30,6 +30,7 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getWriters <em>Writers</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getBooks <em>Books</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getLibrarian <em>Librarian</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getPhoneNumber <em>Phone Number</em>}</li>
  * </ul>
  *
  * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getLibrary()
@@ -44,7 +45,7 @@ public interface Library extends EObject {
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getLibrary_Name()
@@ -58,7 +59,7 @@ public interface Library extends EObject {
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
@@ -76,7 +77,7 @@ public interface Library extends EObject {
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Writers</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getLibrary_Writers()
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getLibrary
@@ -94,7 +95,7 @@ public interface Library extends EObject {
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Books</em>' containment reference list.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getLibrary_Books()
 	 * @model containment="true"
@@ -110,7 +111,7 @@ public interface Library extends EObject {
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Librarian</em>' containment reference.
 	 * @see #setLibrarian(Librarian)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getLibrary_Librarian()
@@ -124,7 +125,7 @@ public interface Library extends EObject {
 	 * <em>Librarian</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Librarian</em>' containment reference.
 	 * @see #getLibrarian()
 	 * @generated
@@ -132,9 +133,38 @@ public interface Library extends EObject {
 	void setLibrarian(Librarian value);
 
 	/**
+	 * Returns the value of the '<em><b>Phone Number</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Phone Number</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Phone Number</em>' attribute.
+	 * @see #setPhoneNumber(String)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getLibrary_PhoneNumber()
+	 * @model dataType="org.eclipse.emf.ecp.view.validation.test.model.PhoneNumber"
+	 * @generated
+	 */
+	String getPhoneNumber();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getPhoneNumber <em>Phone
+	 * Number</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Phone Number</em>' attribute.
+	 * @see #getPhoneNumber()
+	 * @generated
+	 */
+	void setPhoneNumber(String value);
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @model
 	 * @generated
 	 */
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Person.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Person.java
new file mode 100644
index 0000000000..224caa7351
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Person.java
@@ -0,0 +1,185 @@
+/**
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.validation.test.model;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Person</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getFirstName <em>First Name</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getGender <em>Gender</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getLastName <em>Last Name</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getCustom <em>Custom</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getAge <em>Age</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getPerson()
+ * @model
+ * @generated
+ */
+public interface Person extends EObject {
+
+	/**
+	 * Returns the value of the '<em><b>First Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>First Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>First Name</em>' attribute.
+	 * @see #setFirstName(String)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getPerson_FirstName()
+	 * @model dataType="org.eclipse.emf.ecp.view.validation.test.model.StringWithMaxLength8"
+	 * @generated
+	 */
+	String getFirstName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getFirstName <em>First
+	 * Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>First Name</em>' attribute.
+	 * @see #getFirstName()
+	 * @generated
+	 */
+	void setFirstName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Gender</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.emf.ecp.view.validation.test.model.Gender}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Gender</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Gender</em>' attribute.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Gender
+	 * @see #setGender(Gender)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getPerson_Gender()
+	 * @model
+	 * @generated
+	 */
+	Gender getGender();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getGender <em>Gender</em>}'
+	 * attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Gender</em>' attribute.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Gender
+	 * @see #getGender()
+	 * @generated
+	 */
+	void setGender(Gender value);
+
+	/**
+	 * Returns the value of the '<em><b>Last Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Last Name</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Last Name</em>' attribute.
+	 * @see #setLastName(String)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getPerson_LastName()
+	 * @model dataType="org.eclipse.emf.ecp.view.validation.test.model.OnlyCapitals"
+	 * @generated
+	 */
+	String getLastName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getLastName <em>Last
+	 * Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Last Name</em>' attribute.
+	 * @see #getLastName()
+	 * @generated
+	 */
+	void setLastName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Custom</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Custom</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Custom</em>' attribute.
+	 * @see #setCustom(String)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getPerson_Custom()
+	 * @model dataType="org.eclipse.emf.ecp.view.validation.test.model.CustomDataType"
+	 * @generated
+	 */
+	String getCustom();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getCustom <em>Custom</em>}'
+	 * attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Custom</em>' attribute.
+	 * @see #getCustom()
+	 * @generated
+	 */
+	void setCustom(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Age</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Age</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Age</em>' attribute.
+	 * @see #setAge(Integer)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getPerson_Age()
+	 * @model dataType="org.eclipse.emf.ecp.view.validation.test.model.Age"
+	 * @generated
+	 */
+	Integer getAge();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getAge <em>Age</em>}'
+	 * attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Age</em>' attribute.
+	 * @see #getAge()
+	 * @generated
+	 */
+	void setAge(Integer value);
+} // Person
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestFactory.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestFactory.java
index 16ee09c037..d9a813a3ac 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestFactory.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage
  * @generated
  */
@@ -27,7 +27,7 @@ public interface TestFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	TestFactory eINSTANCE = org.eclipse.emf.ecp.view.validation.test.model.impl.TestFactoryImpl.init();
@@ -36,7 +36,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Library</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Library</em>'.
 	 * @generated
 	 */
@@ -46,7 +46,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Writer</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Writer</em>'.
 	 * @generated
 	 */
@@ -56,7 +56,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Book</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Book</em>'.
 	 * @generated
 	 */
@@ -66,7 +66,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Librarian</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Librarian</em>'.
 	 * @generated
 	 */
@@ -76,7 +76,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Computer</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Computer</em>'.
 	 * @generated
 	 */
@@ -86,7 +86,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Mainboard</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Mainboard</em>'.
 	 * @generated
 	 */
@@ -96,7 +96,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Power Block</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Power Block</em>'.
 	 * @generated
 	 */
@@ -106,7 +106,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Container</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Container</em>'.
 	 * @generated
 	 */
@@ -116,7 +116,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Content</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Content</em>'.
 	 * @generated
 	 */
@@ -126,7 +126,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table With Multiplicity</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table With Multiplicity</em>'.
 	 * @generated
 	 */
@@ -136,7 +136,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Content Without Validation</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table Content Without Validation</em>'.
 	 * @generated
 	 */
@@ -146,7 +146,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Content With Validation</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table Content With Validation</em>'.
 	 * @generated
 	 */
@@ -156,7 +156,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Without Multiplicity</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table Without Multiplicity</em>'.
 	 * @generated
 	 */
@@ -166,7 +166,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table With Unique</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table With Unique</em>'.
 	 * @generated
 	 */
@@ -176,7 +176,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Content With Inner Child2</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table Content With Inner Child2</em>'.
 	 * @generated
 	 */
@@ -186,7 +186,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Content With Inner Child</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table Content With Inner Child</em>'.
 	 * @generated
 	 */
@@ -196,7 +196,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Table Without Multiplicity Concrete</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Table Without Multiplicity Concrete</em>'.
 	 * @generated
 	 */
@@ -206,7 +206,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Referencer</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Referencer</em>'.
 	 * @generated
 	 */
@@ -216,7 +216,7 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Cross Reference Container</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Cross Reference Container</em>'.
 	 * @generated
 	 */
@@ -226,17 +226,27 @@ public interface TestFactory extends EFactory {
 	 * Returns a new object of class '<em>Cross Reference Content</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Cross Reference Content</em>'.
 	 * @generated
 	 */
 	CrossReferenceContent createCrossReferenceContent();
 
 	/**
+	 * Returns a new object of class '<em>Person</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return a new object of class '<em>Person</em>'.
+	 * @generated
+	 */
+	Person createPerson();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestPackage.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestPackage.java
index 368518f631..b33a242526 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestPackage.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/TestPackage.java
@@ -13,6 +13,8 @@ package org.eclipse.emf.ecp.view.validation.test.model;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -27,7 +29,7 @@ import org.eclipse.emf.ecore.EReference;
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.ecp.view.validation.test.model.TestFactory
  * @model kind="package"
  * @generated
@@ -37,7 +39,7 @@ public interface TestPackage extends EPackage {
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNAME = "model";
@@ -46,7 +48,7 @@ public interface TestPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "htp://www.eclipse.org/emf/ecp/view/validation/test/model";
@@ -55,7 +57,7 @@ public interface TestPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "org.eclipse.emf.ecp.view.validation.test.model";
@@ -64,7 +66,7 @@ public interface TestPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	TestPackage eINSTANCE = org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl.init();
@@ -74,7 +76,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Library</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.LibraryImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getLibrary()
 	 * @generated
@@ -85,7 +87,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -95,7 +97,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Writers</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -105,7 +107,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Books</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -115,28 +117,38 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Librarian</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LIBRARY__LIBRARIAN = 3;
 
 	/**
+	 * The feature id for the '<em><b>Phone Number</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int LIBRARY__PHONE_NUMBER = 4;
+
+	/**
 	 * The number of structural features of the '<em>Library</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int LIBRARY_FEATURE_COUNT = 4;
+	int LIBRARY_FEATURE_COUNT = 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl <em>Writer</em>
-	 * }' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl
+	 * <em>Writer</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getWriter()
 	 * @generated
@@ -147,7 +159,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>First Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -157,7 +169,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Last Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -167,7 +179,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>EMail</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -177,7 +189,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Birth Date</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -187,7 +199,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Books</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -197,7 +209,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Pseudonym</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -207,28 +219,48 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Library</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int WRITER__LIBRARY = 6;
 
 	/**
+	 * The feature id for the '<em><b>Initials</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int WRITER__INITIALS = 7;
+
+	/**
+	 * The feature id for the '<em><b>Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int WRITER__TITLE = 8;
+
+	/**
 	 * The number of structural features of the '<em>Writer</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int WRITER_FEATURE_COUNT = 7;
+	int WRITER_FEATURE_COUNT = 9;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.BookImpl <em>Book</em>}'
 	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.BookImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getBook()
 	 * @generated
@@ -239,7 +271,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Title</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -249,7 +281,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Pages</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -259,7 +291,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Writers</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -269,7 +301,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Book</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -280,7 +312,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Librarian</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.LibrarianImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getLibrarian()
 	 * @generated
@@ -291,7 +323,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -301,7 +333,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Librarian</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -312,7 +344,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Computer</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ComputerImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getComputer()
 	 * @generated
@@ -323,7 +355,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Mainboard</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -333,7 +365,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -343,28 +375,38 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Power Block</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int COMPUTER__POWER_BLOCK = 2;
 
 	/**
+	 * The feature id for the '<em><b>Colors</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int COMPUTER__COLORS = 3;
+
+	/**
 	 * The number of structural features of the '<em>Computer</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int COMPUTER_FEATURE_COUNT = 3;
+	int COMPUTER_FEATURE_COUNT = 4;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.MainboardImpl
 	 * <em>Mainboard</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.MainboardImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getMainboard()
 	 * @generated
@@ -375,7 +417,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -385,18 +427,18 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Mainboard</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MAINBOARD_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PowerBlockImpl
-	 * <em>Power Block</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PowerBlockImpl <em>Power
+	 * Block</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.PowerBlockImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getPowerBlock()
 	 * @generated
@@ -407,7 +449,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -417,7 +459,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Power Block</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -428,7 +470,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Container</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ContainerImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getContainer()
 	 * @generated
@@ -439,7 +481,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -449,7 +491,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Container</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -460,7 +502,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Content</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ContentImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getContent()
 	 * @generated
@@ -471,7 +513,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Unique Attribute</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -481,7 +523,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Second Attribute</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -491,7 +533,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Content</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -502,7 +544,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Table With Multiplicity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithMultiplicityImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithMultiplicity()
 	 * @generated
@@ -513,7 +555,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Content</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -523,18 +565,18 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table With Multiplicity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_WITH_MULTIPLICITY_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentImpl
-	 * <em>Table Content</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentImpl <em>Table
+	 * Content</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContent()
 	 * @generated
@@ -545,19 +587,19 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Content</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_CONTENT_FEATURE_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithoutValidationImpl
-	 * <em>Table Content Without Validation</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithoutValidationImpl <em>Table Content
+	 * Without Validation</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithoutValidationImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithoutValidation()
 	 * @generated
@@ -568,7 +610,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -578,7 +620,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Weight</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -588,19 +630,19 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Content Without Validation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_CONTENT_WITHOUT_VALIDATION_FEATURE_COUNT = TABLE_CONTENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithValidationImpl
-	 * <em>Table Content With Validation</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithValidationImpl <em>Table Content With
+	 * Validation</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithValidationImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithValidation()
 	 * @generated
@@ -611,7 +653,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -621,7 +663,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Weight</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -631,19 +673,19 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Content With Validation</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_CONTENT_WITH_VALIDATION_FEATURE_COUNT = TABLE_CONTENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityImpl
-	 * <em>Table Without Multiplicity</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityImpl <em>Table Without
+	 * Multiplicity</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithoutMultiplicity()
 	 * @generated
@@ -654,7 +696,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Content</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -664,7 +706,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Without Multiplicity</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -675,7 +717,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Table With Unique</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithUniqueImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithUnique()
 	 * @generated
@@ -686,7 +728,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Content</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -696,19 +738,19 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table With Unique</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_WITH_UNIQUE_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChild2Impl
-	 * <em>Table Content With Inner Child2</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChild2Impl <em>Table Content
+	 * With Inner Child2</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChild2Impl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithInnerChild2()
 	 * @generated
@@ -719,7 +761,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Inner Child</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -729,19 +771,19 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Content With Inner Child2</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_CONTENT_WITH_INNER_CHILD2_FEATURE_COUNT = TABLE_CONTENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChildImpl
-	 * <em>Table Content With Inner Child</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChildImpl <em>Table Content With
+	 * Inner Child</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChildImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithInnerChild()
 	 * @generated
@@ -752,7 +794,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Inner Child</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -762,7 +804,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Stuff</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -772,19 +814,19 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Content With Inner Child</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TABLE_CONTENT_WITH_INNER_CHILD_FEATURE_COUNT = TABLE_CONTENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityConcreteImpl
-	 * <em>Table Without Multiplicity Concrete</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityConcreteImpl <em>Table
+	 * Without Multiplicity Concrete</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityConcreteImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithoutMultiplicityConcrete()
 	 * @generated
@@ -795,7 +837,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Content</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -805,7 +847,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Table Without Multiplicity Concrete</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -816,7 +858,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Referencer</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ReferencerImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getReferencer()
 	 * @generated
@@ -827,7 +869,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Referenced Content</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -837,19 +879,19 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Referencer</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int REFERENCER_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContainerImpl
-	 * <em>Cross Reference Container</em>}' class.
+	 * The meta object id for the
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContainerImpl <em>Cross Reference
+	 * Container</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContainerImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getCrossReferenceContainer()
 	 * @generated
@@ -860,7 +902,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Contents</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -870,7 +912,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Single Content</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -880,7 +922,7 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Cross Reference Container</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -891,7 +933,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Cross Reference Content</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContentImpl
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getCrossReferenceContent()
 	 * @generated
@@ -902,7 +944,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Parent</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -912,7 +954,7 @@ public interface TestPackage extends EPackage {
 	 * The feature id for the '<em><b>Single Parent</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -922,18 +964,189 @@ public interface TestPackage extends EPackage {
 	 * The number of structural features of the '<em>Cross Reference Content</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CROSS_REFERENCE_CONTENT_FEATURE_COUNT = 2;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Library <em>Library</em>
-	 * }'.
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl
+	 * <em>Person</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getPerson()
+	 * @generated
+	 */
+	int PERSON = 21;
+
+	/**
+	 * The feature id for the '<em><b>First Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON__FIRST_NAME = 0;
+
+	/**
+	 * The feature id for the '<em><b>Gender</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON__GENDER = 1;
+
+	/**
+	 * The feature id for the '<em><b>Last Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON__LAST_NAME = 2;
+
+	/**
+	 * The feature id for the '<em><b>Custom</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON__CUSTOM = 3;
+
+	/**
+	 * The feature id for the '<em><b>Age</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON__AGE = 4;
+
+	/**
+	 * The number of structural features of the '<em>Person</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int PERSON_FEATURE_COUNT = 5;
+
+	/**
+	 * The meta object id for the '<em>String With Max Length8</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see java.lang.String
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getStringWithMaxLength8()
+	 * @generated
+	 */
+	int STRING_WITH_MAX_LENGTH8 = 24;
+
+	/**
+	 * The meta object id for the '<em>Only Capitals</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see java.lang.String
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getOnlyCapitals()
+	 * @generated
+	 */
+	int ONLY_CAPITALS = 25;
+
+	/**
+	 * The meta object id for the '<em>Custom Data Type</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see java.lang.String
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getCustomDataType()
+	 * @generated
+	 */
+	int CUSTOM_DATA_TYPE = 26;
+
+	/**
+	 * The meta object id for the '<em>Phone Number</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see java.lang.String
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getPhoneNumber()
+	 * @generated
+	 */
+	int PHONE_NUMBER = 27;
+
+	/**
+	 * The meta object id for the '<em>Min Length Of3</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see java.lang.String
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getMinLengthOf3()
+	 * @generated
+	 */
+	int MIN_LENGTH_OF3 = 28;
+
+	/**
+	 * The meta object id for the '<em>Strict Min Length Of3</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see java.lang.String
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getStrictMinLengthOf3()
+	 * @generated
+	 */
+	int STRICT_MIN_LENGTH_OF3 = 29;
+
+	/**
+	 * The meta object id for the '<em>Age</em>' data type.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see java.lang.Integer
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getAge()
+	 * @generated
+	 */
+	int AGE = 30;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.Gender <em>Gender</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Gender
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getGender()
+	 * @generated
+	 */
+	int GENDER = 22;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.ecp.view.validation.test.model.Color <em>Color</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Color
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getColor()
+	 * @generated
+	 */
+	int COLOR = 23;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Library
+	 * <em>Library</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Library</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Library
 	 * @generated
@@ -945,7 +1158,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Library#getName()
 	 * @see #getLibrary()
@@ -954,11 +1167,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getLibrary_Name();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Library#getWriters <em>Writers</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getWriters <em>Writers</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Writers</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Library#getWriters()
 	 * @see #getLibrary()
@@ -967,11 +1180,11 @@ public interface TestPackage extends EPackage {
 	EReference getLibrary_Writers();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Library#getBooks <em>Books</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getBooks <em>Books</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Books</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Library#getBooks()
 	 * @see #getLibrary()
@@ -980,11 +1193,11 @@ public interface TestPackage extends EPackage {
 	EReference getLibrary_Books();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Library#getLibrarian <em>Librarian</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getLibrarian <em>Librarian</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Librarian</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Library#getLibrarian()
 	 * @see #getLibrary()
@@ -993,11 +1206,24 @@ public interface TestPackage extends EPackage {
 	EReference getLibrary_Librarian();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer <em>Writer</em>}
-	 * '.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Library#getPhoneNumber <em>Phone Number</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Phone Number</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Library#getPhoneNumber()
+	 * @see #getLibrary()
+	 * @generated
+	 */
+	EAttribute getLibrary_PhoneNumber();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer
+	 * <em>Writer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Writer</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer
 	 * @generated
@@ -1005,11 +1231,11 @@ public interface TestPackage extends EPackage {
 	EClass getWriter();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getFirstName <em>First Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getFirstName <em>First Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>First Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getFirstName()
 	 * @see #getWriter()
@@ -1018,11 +1244,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getWriter_FirstName();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getLastName <em>Last Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getLastName <em>Last Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Last Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getLastName()
 	 * @see #getWriter()
@@ -1035,7 +1261,7 @@ public interface TestPackage extends EPackage {
 	 * <em>EMail</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>EMail</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getEMail()
 	 * @see #getWriter()
@@ -1044,11 +1270,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getWriter_EMail();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getBirthDate <em>Birth Date</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getBirthDate <em>Birth Date</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Birth Date</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getBirthDate()
 	 * @see #getWriter()
@@ -1057,11 +1283,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getWriter_BirthDate();
 
 	/**
-	 * Returns the meta object for the reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getBooks <em>Books</em>}'.
+	 * Returns the meta object for the reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getBooks <em>Books</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference list '<em>Books</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getBooks()
 	 * @see #getWriter()
@@ -1070,11 +1296,11 @@ public interface TestPackage extends EPackage {
 	EReference getWriter_Books();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Writer#isPseudonym <em>Pseudonym</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#isPseudonym <em>Pseudonym</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Pseudonym</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#isPseudonym()
 	 * @see #getWriter()
@@ -1083,11 +1309,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getWriter_Pseudonym();
 
 	/**
-	 * Returns the meta object for the container reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getLibrary <em>Library</em>}'.
+	 * Returns the meta object for the container reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getLibrary <em>Library</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the container reference '<em>Library</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getLibrary()
 	 * @see #getWriter()
@@ -1096,10 +1322,36 @@ public interface TestPackage extends EPackage {
 	EReference getWriter_Library();
 
 	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getInitials <em>Initials</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Initials</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getInitials()
+	 * @see #getWriter()
+	 * @generated
+	 */
+	EAttribute getWriter_Initials();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getTitle
+	 * <em>Title</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Title</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Writer#getTitle()
+	 * @see #getWriter()
+	 * @generated
+	 */
+	EAttribute getWriter_Title();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Book <em>Book</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Book</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Book
 	 * @generated
@@ -1111,7 +1363,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Title</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Title</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Book#getTitle()
 	 * @see #getBook()
@@ -1124,7 +1376,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Pages</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Pages</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Book#getPages()
 	 * @see #getBook()
@@ -1137,7 +1389,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Writers</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Writers</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Book#getWriters()
 	 * @see #getBook()
@@ -1150,7 +1402,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Librarian</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Librarian</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Librarian
 	 * @generated
@@ -1158,11 +1410,11 @@ public interface TestPackage extends EPackage {
 	EClass getLibrarian();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Librarian#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Librarian#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Librarian#getName()
 	 * @see #getLibrarian()
@@ -1175,7 +1427,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Computer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Computer</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Computer
 	 * @generated
@@ -1183,11 +1435,11 @@ public interface TestPackage extends EPackage {
 	EClass getComputer();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getMainboard <em>Mainboard</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getMainboard <em>Mainboard</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Mainboard</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Computer#getMainboard()
 	 * @see #getComputer()
@@ -1200,7 +1452,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Computer#getName()
 	 * @see #getComputer()
@@ -1209,11 +1461,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getComputer_Name();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getPowerBlock <em>Power Block</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getPowerBlock <em>Power Block</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Power Block</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Computer#getPowerBlock()
 	 * @see #getComputer()
@@ -1222,11 +1474,24 @@ public interface TestPackage extends EPackage {
 	EReference getComputer_PowerBlock();
 
 	/**
+	 * Returns the meta object for the attribute list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Computer#getColors <em>Colors</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute list '<em>Colors</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Computer#getColors()
+	 * @see #getComputer()
+	 * @generated
+	 */
+	EAttribute getComputer_Colors();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Mainboard
 	 * <em>Mainboard</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Mainboard</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Mainboard
 	 * @generated
@@ -1234,11 +1499,11 @@ public interface TestPackage extends EPackage {
 	EClass getMainboard();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Mainboard#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Mainboard#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Mainboard#getName()
 	 * @see #getMainboard()
@@ -1247,11 +1512,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getMainboard_Name();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.PowerBlock
-	 * <em>Power Block</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.PowerBlock <em>Power
+	 * Block</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Power Block</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.PowerBlock
 	 * @generated
@@ -1259,11 +1524,11 @@ public interface TestPackage extends EPackage {
 	EClass getPowerBlock();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.PowerBlock#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.PowerBlock#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.PowerBlock#getName()
 	 * @see #getPowerBlock()
@@ -1276,7 +1541,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Container</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Container
 	 * @generated
@@ -1284,11 +1549,11 @@ public interface TestPackage extends EPackage {
 	EClass getContainer();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Container#getContents <em>Contents</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Container#getContents <em>Contents</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Contents</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Container#getContents()
 	 * @see #getContainer()
@@ -1297,11 +1562,11 @@ public interface TestPackage extends EPackage {
 	EReference getContainer_Contents();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Content <em>Content</em>
-	 * }'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Content
+	 * <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Content
 	 * @generated
@@ -1309,11 +1574,11 @@ public interface TestPackage extends EPackage {
 	EClass getContent();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Content#getUniqueAttribute <em>Unique Attribute</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Content#getUniqueAttribute <em>Unique Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Unique Attribute</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Content#getUniqueAttribute()
 	 * @see #getContent()
@@ -1322,11 +1587,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getContent_UniqueAttribute();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Content#getSecondAttribute <em>Second Attribute</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Content#getSecondAttribute <em>Second Attribute</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Second Attribute</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Content#getSecondAttribute()
 	 * @see #getContent()
@@ -1339,7 +1604,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Table With Multiplicity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table With Multiplicity</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithMultiplicity
 	 * @generated
@@ -1347,11 +1612,11 @@ public interface TestPackage extends EPackage {
 	EClass getTableWithMultiplicity();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithMultiplicity#getContent <em>Content</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithMultiplicity#getContent <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithMultiplicity#getContent()
 	 * @see #getTableWithMultiplicity()
@@ -1360,11 +1625,11 @@ public interface TestPackage extends EPackage {
 	EReference getTableWithMultiplicity_Content();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContent
-	 * <em>Table Content</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContent <em>Table
+	 * Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContent
 	 * @generated
@@ -1372,12 +1637,12 @@ public interface TestPackage extends EPackage {
 	EClass getTableContent();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation
-	 * <em>Table Content Without Validation</em>}'.
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation <em>Table Content Without
+	 * Validation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Content Without Validation</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation
 	 * @generated
@@ -1385,11 +1650,11 @@ public interface TestPackage extends EPackage {
 	EClass getTableContentWithoutValidation();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation#getName()
 	 * @see #getTableContentWithoutValidation()
@@ -1398,11 +1663,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getTableContentWithoutValidation_Name();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation#getWeight <em>Weight</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation#getWeight <em>Weight</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Weight</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation#getWeight()
 	 * @see #getTableContentWithoutValidation()
@@ -1411,12 +1676,12 @@ public interface TestPackage extends EPackage {
 	EAttribute getTableContentWithoutValidation_Weight();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation
-	 * <em>Table Content With Validation</em>}'.
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation <em>Table Content With
+	 * Validation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Content With Validation</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation
 	 * @generated
@@ -1424,11 +1689,11 @@ public interface TestPackage extends EPackage {
 	EClass getTableContentWithValidation();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation#getName <em>Name</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation#getName()
 	 * @see #getTableContentWithValidation()
@@ -1437,11 +1702,11 @@ public interface TestPackage extends EPackage {
 	EAttribute getTableContentWithValidation_Name();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation#getWeight <em>Weight</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation#getWeight <em>Weight</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Weight</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation#getWeight()
 	 * @see #getTableContentWithValidation()
@@ -1454,7 +1719,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Table Without Multiplicity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Without Multiplicity</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicity
 	 * @generated
@@ -1462,11 +1727,11 @@ public interface TestPackage extends EPackage {
 	EClass getTableWithoutMultiplicity();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicity#getContent <em>Content</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicity#getContent <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicity#getContent()
 	 * @see #getTableWithoutMultiplicity()
@@ -1479,7 +1744,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Table With Unique</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table With Unique</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithUnique
 	 * @generated
@@ -1487,11 +1752,11 @@ public interface TestPackage extends EPackage {
 	EClass getTableWithUnique();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithUnique#getContent <em>Content</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithUnique#getContent <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithUnique#getContent()
 	 * @see #getTableWithUnique()
@@ -1500,12 +1765,12 @@ public interface TestPackage extends EPackage {
 	EReference getTableWithUnique_Content();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2
-	 * <em>Table Content With Inner Child2</em>}'.
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2 <em>Table Content With Inner
+	 * Child2</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Content With Inner Child2</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2
 	 * @generated
@@ -1513,12 +1778,12 @@ public interface TestPackage extends EPackage {
 	EClass getTableContentWithInnerChild2();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2#getInnerChild
-	 * <em>Inner Child</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2#getInnerChild <em>Inner
+	 * Child</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Inner Child</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2#getInnerChild()
 	 * @see #getTableContentWithInnerChild2()
@@ -1527,12 +1792,12 @@ public interface TestPackage extends EPackage {
 	EReference getTableContentWithInnerChild2_InnerChild();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild
-	 * <em>Table Content With Inner Child</em>}'.
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild <em>Table Content With Inner
+	 * Child</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Content With Inner Child</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild
 	 * @generated
@@ -1540,12 +1805,12 @@ public interface TestPackage extends EPackage {
 	EClass getTableContentWithInnerChild();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild#getInnerChild
-	 * <em>Inner Child</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild#getInnerChild <em>Inner
+	 * Child</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Inner Child</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild#getInnerChild()
 	 * @see #getTableContentWithInnerChild()
@@ -1554,11 +1819,11 @@ public interface TestPackage extends EPackage {
 	EReference getTableContentWithInnerChild_InnerChild();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild#getStuff <em>Stuff</em>}'.
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild#getStuff <em>Stuff</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Stuff</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild#getStuff()
 	 * @see #getTableContentWithInnerChild()
@@ -1567,12 +1832,12 @@ public interface TestPackage extends EPackage {
 	EAttribute getTableContentWithInnerChild_Stuff();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete
-	 * <em>Table Without Multiplicity Concrete</em>}'.
+	 * Returns the meta object for class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete <em>Table Without
+	 * Multiplicity Concrete</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Table Without Multiplicity Concrete</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete
 	 * @generated
@@ -1580,12 +1845,12 @@ public interface TestPackage extends EPackage {
 	EClass getTableWithoutMultiplicityConcrete();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete#getContent
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete#getContent
 	 * <em>Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete#getContent()
 	 * @see #getTableWithoutMultiplicityConcrete()
@@ -1598,7 +1863,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Referencer</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Referencer</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Referencer
 	 * @generated
@@ -1606,12 +1871,12 @@ public interface TestPackage extends EPackage {
 	EClass getReferencer();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.Referencer#getReferencedContent <em>Referenced Content</em>
-	 * }'.
+	 * Returns the meta object for the reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Referencer#getReferencedContent <em>Referenced
+	 * Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Referenced Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Referencer#getReferencedContent()
 	 * @see #getReferencer()
@@ -1624,7 +1889,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Cross Reference Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Cross Reference Container</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer
 	 * @generated
@@ -1632,11 +1897,11 @@ public interface TestPackage extends EPackage {
 	EClass getCrossReferenceContainer();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer#getContents <em>Contents</em>}'.
+	 * Returns the meta object for the containment reference list
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer#getContents <em>Contents</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Contents</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer#getContents()
 	 * @see #getCrossReferenceContainer()
@@ -1645,12 +1910,12 @@ public interface TestPackage extends EPackage {
 	EReference getCrossReferenceContainer_Contents();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer#getSingleContent
-	 * <em>Single Content</em>}'.
+	 * Returns the meta object for the containment reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer#getSingleContent <em>Single
+	 * Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Single Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer#getSingleContent()
 	 * @see #getCrossReferenceContainer()
@@ -1663,7 +1928,7 @@ public interface TestPackage extends EPackage {
 	 * <em>Cross Reference Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Cross Reference Content</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent
 	 * @generated
@@ -1671,11 +1936,11 @@ public interface TestPackage extends EPackage {
 	EClass getCrossReferenceContent();
 
 	/**
-	 * Returns the meta object for the container reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent#getParent <em>Parent</em>}'.
+	 * Returns the meta object for the container reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent#getParent <em>Parent</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the container reference '<em>Parent</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent#getParent()
 	 * @see #getCrossReferenceContent()
@@ -1684,12 +1949,12 @@ public interface TestPackage extends EPackage {
 	EReference getCrossReferenceContent_Parent();
 
 	/**
-	 * Returns the meta object for the container reference '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent#getSingleParent
-	 * <em>Single Parent</em>}'.
+	 * Returns the meta object for the container reference
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent#getSingleParent <em>Single
+	 * Parent</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the container reference '<em>Single Parent</em>'.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent#getSingleParent()
 	 * @see #getCrossReferenceContent()
@@ -1698,10 +1963,199 @@ public interface TestPackage extends EPackage {
 	EReference getCrossReferenceContent_SingleParent();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.validation.test.model.Person
+	 * <em>Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Person</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Person
+	 * @generated
+	 */
+	EClass getPerson();
+
+	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getFirstName <em>First Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>First Name</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Person#getFirstName()
+	 * @see #getPerson()
+	 * @generated
+	 */
+	EAttribute getPerson_FirstName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getGender
+	 * <em>Gender</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Gender</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Person#getGender()
+	 * @see #getPerson()
+	 * @generated
+	 */
+	EAttribute getPerson_Gender();
+
+	/**
+	 * Returns the meta object for the attribute
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getLastName <em>Last Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Last Name</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Person#getLastName()
+	 * @see #getPerson()
+	 * @generated
+	 */
+	EAttribute getPerson_LastName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getCustom
+	 * <em>Custom</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Custom</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Person#getCustom()
+	 * @see #getPerson()
+	 * @generated
+	 */
+	EAttribute getPerson_Custom();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.ecp.view.validation.test.model.Person#getAge
+	 * <em>Age</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Age</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Person#getAge()
+	 * @see #getPerson()
+	 * @generated
+	 */
+	EAttribute getPerson_Age();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.String <em>String With Max Length8</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for data type '<em>String With Max Length8</em>'.
+	 * @see java.lang.String
+	 * @model instanceClass="java.lang.String"
+	 *        extendedMetaData="maxLength='8'"
+	 * @generated
+	 */
+	EDataType getStringWithMaxLength8();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.String <em>Only Capitals</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for data type '<em>Only Capitals</em>'.
+	 * @see java.lang.String
+	 * @model instanceClass="java.lang.String"
+	 *        extendedMetaData="pattern='[A-Z]+'"
+	 * @generated
+	 */
+	EDataType getOnlyCapitals();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.String <em>Custom Data Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for data type '<em>Custom Data Type</em>'.
+	 * @see java.lang.String
+	 * @model instanceClass="java.lang.String"
+	 * @generated
+	 */
+	EDataType getCustomDataType();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.String <em>Phone Number</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for data type '<em>Phone Number</em>'.
+	 * @see java.lang.String
+	 * @model instanceClass="java.lang.String"
+	 *        extendedMetaData="pattern='((\\+)?[a-c0-9*#]{1,20}){0,1}' loosePattern='[+0-9]+'"
+	 * @generated
+	 */
+	EDataType getPhoneNumber();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.String <em>Min Length Of3</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for data type '<em>Min Length Of3</em>'.
+	 * @see java.lang.String
+	 * @model instanceClass="java.lang.String"
+	 *        extendedMetaData="minLength='3' looseMinLength='0'"
+	 * @generated
+	 */
+	EDataType getMinLengthOf3();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.String <em>Strict Min Length Of3</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for data type '<em>Strict Min Length Of3</em>'.
+	 * @see java.lang.String
+	 * @model instanceClass="java.lang.String"
+	 *        extendedMetaData="minLength='3'"
+	 * @generated
+	 */
+	EDataType getStrictMinLengthOf3();
+
+	/**
+	 * Returns the meta object for data type '{@link java.lang.Integer <em>Age</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for data type '<em>Age</em>'.
+	 * @see java.lang.Integer
+	 * @model instanceClass="java.lang.Integer"
+	 *        extendedMetaData="minInclusive='0' maxInclusive='100'"
+	 * @generated
+	 */
+	EDataType getAge();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.validation.test.model.Gender <em>Gender</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for enum '<em>Gender</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Gender
+	 * @generated
+	 */
+	EEnum getGender();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.validation.test.model.Color <em>Color</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for enum '<em>Color</em>'.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Color
+	 * @generated
+	 */
+	EEnum getColor();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1717,7 +2171,7 @@ public interface TestPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -1726,7 +2180,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Library</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.LibraryImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getLibrary()
 		 * @generated
@@ -1737,7 +2191,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute LIBRARY__NAME = eINSTANCE.getLibrary_Name();
@@ -1746,7 +2200,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Writers</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference LIBRARY__WRITERS = eINSTANCE.getLibrary_Writers();
@@ -1755,7 +2209,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Books</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference LIBRARY__BOOKS = eINSTANCE.getLibrary_Books();
@@ -1764,17 +2218,26 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Librarian</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference LIBRARY__LIBRARIAN = eINSTANCE.getLibrary_Librarian();
 
 		/**
+		 * The meta object literal for the '<em><b>Phone Number</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute LIBRARY__PHONE_NUMBER = eINSTANCE.getLibrary_PhoneNumber();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl
 		 * <em>Writer</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getWriter()
 		 * @generated
@@ -1785,7 +2248,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute WRITER__FIRST_NAME = eINSTANCE.getWriter_FirstName();
@@ -1794,7 +2257,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute WRITER__LAST_NAME = eINSTANCE.getWriter_LastName();
@@ -1803,7 +2266,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>EMail</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute WRITER__EMAIL = eINSTANCE.getWriter_EMail();
@@ -1812,7 +2275,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Birth Date</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute WRITER__BIRTH_DATE = eINSTANCE.getWriter_BirthDate();
@@ -1821,7 +2284,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Books</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference WRITER__BOOKS = eINSTANCE.getWriter_Books();
@@ -1830,7 +2293,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Pseudonym</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute WRITER__PSEUDONYM = eINSTANCE.getWriter_Pseudonym();
@@ -1839,17 +2302,35 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Library</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference WRITER__LIBRARY = eINSTANCE.getWriter_Library();
 
 		/**
+		 * The meta object literal for the '<em><b>Initials</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute WRITER__INITIALS = eINSTANCE.getWriter_Initials();
+
+		/**
+		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute WRITER__TITLE = eINSTANCE.getWriter_Title();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.BookImpl
 		 * <em>Book</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.BookImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getBook()
 		 * @generated
@@ -1860,7 +2341,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute BOOK__TITLE = eINSTANCE.getBook_Title();
@@ -1869,7 +2350,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Pages</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute BOOK__PAGES = eINSTANCE.getBook_Pages();
@@ -1878,7 +2359,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Writers</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference BOOK__WRITERS = eINSTANCE.getBook_Writers();
@@ -1888,7 +2369,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Librarian</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.LibrarianImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getLibrarian()
 		 * @generated
@@ -1899,7 +2380,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute LIBRARIAN__NAME = eINSTANCE.getLibrarian_Name();
@@ -1909,7 +2390,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Computer</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ComputerImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getComputer()
 		 * @generated
@@ -1920,7 +2401,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Mainboard</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference COMPUTER__MAINBOARD = eINSTANCE.getComputer_Mainboard();
@@ -1929,7 +2410,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute COMPUTER__NAME = eINSTANCE.getComputer_Name();
@@ -1938,17 +2419,26 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Power Block</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference COMPUTER__POWER_BLOCK = eINSTANCE.getComputer_PowerBlock();
 
 		/**
+		 * The meta object literal for the '<em><b>Colors</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute COMPUTER__COLORS = eINSTANCE.getComputer_Colors();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.MainboardImpl
 		 * <em>Mainboard</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.MainboardImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getMainboard()
 		 * @generated
@@ -1959,7 +2449,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MAINBOARD__NAME = eINSTANCE.getMainboard_Name();
@@ -1969,7 +2459,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Power Block</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.PowerBlockImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getPowerBlock()
 		 * @generated
@@ -1980,7 +2470,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute POWER_BLOCK__NAME = eINSTANCE.getPowerBlock_Name();
@@ -1990,7 +2480,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Container</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ContainerImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getContainer()
 		 * @generated
@@ -2001,7 +2491,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference CONTAINER__CONTENTS = eINSTANCE.getContainer_Contents();
@@ -2011,7 +2501,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Content</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ContentImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getContent()
 		 * @generated
@@ -2022,7 +2512,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Unique Attribute</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute CONTENT__UNIQUE_ATTRIBUTE = eINSTANCE.getContent_UniqueAttribute();
@@ -2031,18 +2521,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Second Attribute</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute CONTENT__SECOND_ATTRIBUTE = eINSTANCE.getContent_SecondAttribute();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithMultiplicityImpl
-		 * <em>Table With Multiplicity</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithMultiplicityImpl <em>Table With
+		 * Multiplicity</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithMultiplicityImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithMultiplicity()
 		 * @generated
@@ -2053,7 +2543,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Content</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TABLE_WITH_MULTIPLICITY__CONTENT = eINSTANCE.getTableWithMultiplicity_Content();
@@ -2063,7 +2553,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Table Content</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContent()
 		 * @generated
@@ -2071,12 +2561,12 @@ public interface TestPackage extends EPackage {
 		EClass TABLE_CONTENT = eINSTANCE.getTableContent();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithoutValidationImpl
-		 * <em>Table Content Without Validation</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithoutValidationImpl <em>Table
+		 * Content Without Validation</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithoutValidationImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithoutValidation()
 		 * @generated
@@ -2087,7 +2577,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TABLE_CONTENT_WITHOUT_VALIDATION__NAME = eINSTANCE.getTableContentWithoutValidation_Name();
@@ -2096,18 +2586,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Weight</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TABLE_CONTENT_WITHOUT_VALIDATION__WEIGHT = eINSTANCE.getTableContentWithoutValidation_Weight();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithValidationImpl
-		 * <em>Table Content With Validation</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithValidationImpl <em>Table Content
+		 * With Validation</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithValidationImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithValidation()
 		 * @generated
@@ -2118,7 +2608,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TABLE_CONTENT_WITH_VALIDATION__NAME = eINSTANCE.getTableContentWithValidation_Name();
@@ -2127,18 +2617,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Weight</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TABLE_CONTENT_WITH_VALIDATION__WEIGHT = eINSTANCE.getTableContentWithValidation_Weight();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityImpl
-		 * <em>Table Without Multiplicity</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityImpl <em>Table Without
+		 * Multiplicity</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithoutMultiplicity()
 		 * @generated
@@ -2149,18 +2639,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Content</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TABLE_WITHOUT_MULTIPLICITY__CONTENT = eINSTANCE.getTableWithoutMultiplicity_Content();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithUniqueImpl <em>Table With Unique</em>}'
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithUniqueImpl <em>Table With Unique</em>}'
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithUniqueImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithUnique()
 		 * @generated
@@ -2171,18 +2661,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Content</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TABLE_WITH_UNIQUE__CONTENT = eINSTANCE.getTableWithUnique_Content();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChild2Impl
-		 * <em>Table Content With Inner Child2</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChild2Impl <em>Table Content
+		 * With Inner Child2</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChild2Impl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithInnerChild2()
 		 * @generated
@@ -2193,18 +2683,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Inner Child</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TABLE_CONTENT_WITH_INNER_CHILD2__INNER_CHILD = eINSTANCE.getTableContentWithInnerChild2_InnerChild();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChildImpl
-		 * <em>Table Content With Inner Child</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChildImpl <em>Table Content
+		 * With Inner Child</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableContentWithInnerChildImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableContentWithInnerChild()
 		 * @generated
@@ -2215,7 +2705,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Inner Child</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TABLE_CONTENT_WITH_INNER_CHILD__INNER_CHILD = eINSTANCE.getTableContentWithInnerChild_InnerChild();
@@ -2224,18 +2714,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Stuff</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TABLE_CONTENT_WITH_INNER_CHILD__STUFF = eINSTANCE.getTableContentWithInnerChild_Stuff();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityConcreteImpl
-		 * <em>Table Without Multiplicity Concrete</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityConcreteImpl <em>Table
+		 * Without Multiplicity Concrete</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TableWithoutMultiplicityConcreteImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getTableWithoutMultiplicityConcrete()
 		 * @generated
@@ -2246,7 +2736,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Content</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TABLE_WITHOUT_MULTIPLICITY_CONCRETE__CONTENT = eINSTANCE
@@ -2257,7 +2747,7 @@ public interface TestPackage extends EPackage {
 		 * <em>Referencer</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.ReferencerImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getReferencer()
 		 * @generated
@@ -2268,18 +2758,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Referenced Content</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference REFERENCER__REFERENCED_CONTENT = eINSTANCE.getReferencer_ReferencedContent();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContainerImpl
-		 * <em>Cross Reference Container</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContainerImpl <em>Cross Reference
+		 * Container</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContainerImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getCrossReferenceContainer()
 		 * @generated
@@ -2290,7 +2780,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference CROSS_REFERENCE_CONTAINER__CONTENTS = eINSTANCE.getCrossReferenceContainer_Contents();
@@ -2299,18 +2789,18 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Single Content</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference CROSS_REFERENCE_CONTAINER__SINGLE_CONTENT = eINSTANCE.getCrossReferenceContainer_SingleContent();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContentImpl
-		 * <em>Cross Reference Content</em>}' class.
+		 * The meta object literal for the
+		 * '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContentImpl <em>Cross Reference
+		 * Content</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.CrossReferenceContentImpl
 		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getCrossReferenceContent()
 		 * @generated
@@ -2321,7 +2811,7 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Parent</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference CROSS_REFERENCE_CONTENT__PARENT = eINSTANCE.getCrossReferenceContent_Parent();
@@ -2330,11 +2820,169 @@ public interface TestPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Single Parent</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference CROSS_REFERENCE_CONTENT__SINGLE_PARENT = eINSTANCE.getCrossReferenceContent_SingleParent();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl
+		 * <em>Person</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getPerson()
+		 * @generated
+		 */
+		EClass PERSON = eINSTANCE.getPerson();
+
+		/**
+		 * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute PERSON__FIRST_NAME = eINSTANCE.getPerson_FirstName();
+
+		/**
+		 * The meta object literal for the '<em><b>Gender</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute PERSON__GENDER = eINSTANCE.getPerson_Gender();
+
+		/**
+		 * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute PERSON__LAST_NAME = eINSTANCE.getPerson_LastName();
+
+		/**
+		 * The meta object literal for the '<em><b>Custom</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute PERSON__CUSTOM = eINSTANCE.getPerson_Custom();
+
+		/**
+		 * The meta object literal for the '<em><b>Age</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute PERSON__AGE = eINSTANCE.getPerson_Age();
+
+		/**
+		 * The meta object literal for the '<em>String With Max Length8</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see java.lang.String
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getStringWithMaxLength8()
+		 * @generated
+		 */
+		EDataType STRING_WITH_MAX_LENGTH8 = eINSTANCE.getStringWithMaxLength8();
+
+		/**
+		 * The meta object literal for the '<em>Only Capitals</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see java.lang.String
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getOnlyCapitals()
+		 * @generated
+		 */
+		EDataType ONLY_CAPITALS = eINSTANCE.getOnlyCapitals();
+
+		/**
+		 * The meta object literal for the '<em>Custom Data Type</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see java.lang.String
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getCustomDataType()
+		 * @generated
+		 */
+		EDataType CUSTOM_DATA_TYPE = eINSTANCE.getCustomDataType();
+
+		/**
+		 * The meta object literal for the '<em>Phone Number</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see java.lang.String
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getPhoneNumber()
+		 * @generated
+		 */
+		EDataType PHONE_NUMBER = eINSTANCE.getPhoneNumber();
+
+		/**
+		 * The meta object literal for the '<em>Min Length Of3</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see java.lang.String
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getMinLengthOf3()
+		 * @generated
+		 */
+		EDataType MIN_LENGTH_OF3 = eINSTANCE.getMinLengthOf3();
+
+		/**
+		 * The meta object literal for the '<em>Strict Min Length Of3</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see java.lang.String
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getStrictMinLengthOf3()
+		 * @generated
+		 */
+		EDataType STRICT_MIN_LENGTH_OF3 = eINSTANCE.getStrictMinLengthOf3();
+
+		/**
+		 * The meta object literal for the '<em>Age</em>' data type.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see java.lang.Integer
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getAge()
+		 * @generated
+		 */
+		EDataType AGE = eINSTANCE.getAge();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.validation.test.model.Gender
+		 * <em>Gender</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.Gender
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getGender()
+		 * @generated
+		 */
+		EEnum GENDER = eINSTANCE.getGender();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.ecp.view.validation.test.model.Color <em>Color</em>}'
+		 * enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.Color
+		 * @see org.eclipse.emf.ecp.view.validation.test.model.impl.TestPackageImpl#getColor()
+		 * @generated
+		 */
+		EEnum COLOR = eINSTANCE.getColor();
+
 	}
 
 } // TestPackage
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Writer.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Writer.java
index b366380648..cf91ff3af3 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Writer.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/Writer.java
@@ -34,6 +34,8 @@ import org.eclipse.emf.ecore.EObject;
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getBooks <em>Books</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#isPseudonym <em>Pseudonym</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getLibrary <em>Library</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getInitials <em>Initials</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getTitle <em>Title</em>}</li>
  * </ul>
  *
  * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter()
@@ -49,7 +51,7 @@ public interface Writer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>First Name</em>' attribute.
 	 * @see #setFirstName(String)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_FirstName()
@@ -59,11 +61,11 @@ public interface Writer extends EObject {
 	String getFirstName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getFirstName
-	 * <em>First Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getFirstName <em>First
+	 * Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>First Name</em>' attribute.
 	 * @see #getFirstName()
 	 * @generated
@@ -78,7 +80,7 @@ public interface Writer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Last Name</em>' attribute.
 	 * @see #setLastName(String)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_LastName()
@@ -88,11 +90,11 @@ public interface Writer extends EObject {
 	String getLastName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getLastName
-	 * <em>Last Name</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getLastName <em>Last
+	 * Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Last Name</em>' attribute.
 	 * @see #getLastName()
 	 * @generated
@@ -107,7 +109,7 @@ public interface Writer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>EMail</em>' attribute.
 	 * @see #setEMail(String)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_EMail()
@@ -121,7 +123,7 @@ public interface Writer extends EObject {
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>EMail</em>' attribute.
 	 * @see #getEMail()
 	 * @generated
@@ -136,7 +138,7 @@ public interface Writer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Birth Date</em>' attribute.
 	 * @see #setBirthDate(Date)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_BirthDate()
@@ -146,11 +148,11 @@ public interface Writer extends EObject {
 	Date getBirthDate();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getBirthDate
-	 * <em>Birth Date</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getBirthDate <em>Birth
+	 * Date</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Birth Date</em>' attribute.
 	 * @see #getBirthDate()
 	 * @generated
@@ -168,7 +170,7 @@ public interface Writer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Books</em>' reference list.
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_Books()
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.Book#getWriters
@@ -186,7 +188,7 @@ public interface Writer extends EObject {
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Pseudonym</em>' attribute.
 	 * @see #setPseudonym(boolean)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_Pseudonym()
@@ -200,7 +202,7 @@ public interface Writer extends EObject {
 	 * <em>Pseudonym</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Pseudonym</em>' attribute.
 	 * @see #isPseudonym()
 	 * @generated
@@ -217,7 +219,7 @@ public interface Writer extends EObject {
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Library</em>' container reference.
 	 * @see #setLibrary(Library)
 	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_Library()
@@ -232,7 +234,7 @@ public interface Writer extends EObject {
 	 * container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Library</em>' container reference.
 	 * @see #getLibrary()
 	 * @generated
@@ -240,9 +242,67 @@ public interface Writer extends EObject {
 	void setLibrary(Library value);
 
 	/**
+	 * Returns the value of the '<em><b>Initials</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Initials</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Initials</em>' attribute.
+	 * @see #setInitials(String)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_Initials()
+	 * @model dataType="org.eclipse.emf.ecp.view.validation.test.model.MinLengthOf3"
+	 * @generated
+	 */
+	String getInitials();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getInitials
+	 * <em>Initials</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Initials</em>' attribute.
+	 * @see #getInitials()
+	 * @generated
+	 */
+	void setInitials(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Title</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Title</em>' attribute.
+	 * @see #setTitle(String)
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.TestPackage#getWriter_Title()
+	 * @model dataType="org.eclipse.emf.ecp.view.validation.test.model.StrictMinLengthOf3"
+	 * @generated
+	 */
+	String getTitle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.ecp.view.validation.test.model.Writer#getTitle <em>Title</em>}'
+	 * attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Title</em>' attribute.
+	 * @see #getTitle()
+	 * @generated
+	 */
+	void setTitle(String value);
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @model
 	 * @generated
 	 */
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/ComputerImpl.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/ComputerImpl.java
index 0730158947..bb56debf83 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/ComputerImpl.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/ComputerImpl.java
@@ -11,12 +11,17 @@
  *******************************************************************************/
 package org.eclipse.emf.ecp.view.validation.test.model.impl;
 
+import java.util.Collection;
+
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecp.view.validation.test.model.Color;
 import org.eclipse.emf.ecp.view.validation.test.model.Computer;
 import org.eclipse.emf.ecp.view.validation.test.model.Mainboard;
 import org.eclipse.emf.ecp.view.validation.test.model.PowerBlock;
@@ -33,6 +38,7 @@ import org.eclipse.emf.ecp.view.validation.test.model.TestPackage;
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.ComputerImpl#getMainboard <em>Mainboard</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.ComputerImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.ComputerImpl#getPowerBlock <em>Power Block</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.ComputerImpl#getColors <em>Colors</em>}</li>
  * </ul>
  *
  * @generated
@@ -83,6 +89,17 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 	protected PowerBlock powerBlock;
 
 	/**
+	 * The cached value of the '{@link #getColors() <em>Colors</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getColors()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Color> colors;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -256,6 +273,20 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 	 * @generated
 	 */
 	@Override
+	public EList<Color> getColors() {
+		if (colors == null) {
+			colors = new EDataTypeUniqueEList<Color>(Color.class, this, TestPackage.COMPUTER__COLORS);
+		}
+		return colors;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 		case TestPackage.COMPUTER__MAINBOARD:
@@ -281,6 +312,8 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 			return getName();
 		case TestPackage.COMPUTER__POWER_BLOCK:
 			return getPowerBlock();
+		case TestPackage.COMPUTER__COLORS:
+			return getColors();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -291,6 +324,7 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 	 *
 	 * @generated
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
@@ -303,6 +337,10 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 		case TestPackage.COMPUTER__POWER_BLOCK:
 			setPowerBlock((PowerBlock) newValue);
 			return;
+		case TestPackage.COMPUTER__COLORS:
+			getColors().clear();
+			getColors().addAll((Collection<? extends Color>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -325,6 +363,9 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 		case TestPackage.COMPUTER__POWER_BLOCK:
 			setPowerBlock((PowerBlock) null);
 			return;
+		case TestPackage.COMPUTER__COLORS:
+			getColors().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -344,6 +385,8 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		case TestPackage.COMPUTER__POWER_BLOCK:
 			return powerBlock != null;
+		case TestPackage.COMPUTER__COLORS:
+			return colors != null && !colors.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -363,6 +406,8 @@ public class ComputerImpl extends EObjectImpl implements Computer {
 		final StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
 		result.append(name);
+		result.append(", colors: ");
+		result.append(colors);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/LibraryImpl.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/LibraryImpl.java
index d01b9a48b9..8ab2553022 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/LibraryImpl.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/LibraryImpl.java
@@ -46,6 +46,7 @@ import org.eclipse.emf.ecp.view.validation.test.model.util.TestValidator;
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.LibraryImpl#getWriters <em>Writers</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.LibraryImpl#getBooks <em>Books</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.LibraryImpl#getLibrarian <em>Librarian</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.LibraryImpl#getPhoneNumber <em>Phone Number</em>}</li>
  * </ul>
  *
  * @generated
@@ -107,6 +108,28 @@ public class LibraryImpl extends EObjectImpl implements Library {
 	protected Librarian librarian;
 
 	/**
+	 * The default value of the '{@link #getPhoneNumber() <em>Phone Number</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPhoneNumber()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String PHONE_NUMBER_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getPhoneNumber() <em>Phone Number</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getPhoneNumber()
+	 * @generated
+	 * @ordered
+	 */
+	protected String phoneNumber = PHONE_NUMBER_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -246,6 +269,33 @@ public class LibraryImpl extends EObjectImpl implements Library {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
+	 * @generated
+	 */
+	@Override
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setPhoneNumber(String newPhoneNumber) {
+		final String oldPhoneNumber = phoneNumber;
+		phoneNumber = newPhoneNumber;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, TestPackage.LIBRARY__PHONE_NUMBER, oldPhoneNumber,
+				phoneNumber));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
 	 * @generated NOT
 	 */
 	@Override
@@ -316,6 +366,8 @@ public class LibraryImpl extends EObjectImpl implements Library {
 			return getBooks();
 		case TestPackage.LIBRARY__LIBRARIAN:
 			return getLibrarian();
+		case TestPackage.LIBRARY__PHONE_NUMBER:
+			return getPhoneNumber();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -344,6 +396,9 @@ public class LibraryImpl extends EObjectImpl implements Library {
 		case TestPackage.LIBRARY__LIBRARIAN:
 			setLibrarian((Librarian) newValue);
 			return;
+		case TestPackage.LIBRARY__PHONE_NUMBER:
+			setPhoneNumber((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -369,6 +424,9 @@ public class LibraryImpl extends EObjectImpl implements Library {
 		case TestPackage.LIBRARY__LIBRARIAN:
 			setLibrarian((Librarian) null);
 			return;
+		case TestPackage.LIBRARY__PHONE_NUMBER:
+			setPhoneNumber(PHONE_NUMBER_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -390,6 +448,8 @@ public class LibraryImpl extends EObjectImpl implements Library {
 			return books != null && !books.isEmpty();
 		case TestPackage.LIBRARY__LIBRARIAN:
 			return librarian != null;
+		case TestPackage.LIBRARY__PHONE_NUMBER:
+			return PHONE_NUMBER_EDEFAULT == null ? phoneNumber != null : !PHONE_NUMBER_EDEFAULT.equals(phoneNumber);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -409,6 +469,8 @@ public class LibraryImpl extends EObjectImpl implements Library {
 		final StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
 		result.append(name);
+		result.append(", phoneNumber: ");
+		result.append(phoneNumber);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/PersonImpl.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/PersonImpl.java
new file mode 100644
index 0000000000..b22cbc8629
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/PersonImpl.java
@@ -0,0 +1,426 @@
+/**
+ * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emf.ecp.view.validation.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecp.view.validation.test.model.Gender;
+import org.eclipse.emf.ecp.view.validation.test.model.Person;
+import org.eclipse.emf.ecp.view.validation.test.model.TestPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Person</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl#getFirstName <em>First Name</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl#getGender <em>Gender</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl#getLastName <em>Last Name</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl#getCustom <em>Custom</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.PersonImpl#getAge <em>Age</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PersonImpl extends EObjectImpl implements Person {
+	/**
+	 * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFirstName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FIRST_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getFirstName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String firstName = FIRST_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getGender() <em>Gender</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getGender()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Gender GENDER_EDEFAULT = Gender.MALE;
+	/**
+	 * The cached value of the '{@link #getGender() <em>Gender</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getGender()
+	 * @generated
+	 * @ordered
+	 */
+	protected Gender gender = GENDER_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getLastName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LAST_NAME_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getLastName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String lastName = LAST_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getCustom() <em>Custom</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCustom()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String CUSTOM_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getCustom() <em>Custom</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getCustom()
+	 * @generated
+	 * @ordered
+	 */
+	protected String custom = CUSTOM_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getAge() <em>Age</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAge()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final Integer AGE_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getAge() <em>Age</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getAge()
+	 * @generated
+	 * @ordered
+	 */
+	protected Integer age = AGE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected PersonImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestPackage.Literals.PERSON;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getFirstName() {
+		return firstName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setFirstName(String newFirstName) {
+		final String oldFirstName = firstName;
+		firstName = newFirstName;
+		if (eNotificationRequired()) {
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, TestPackage.PERSON__FIRST_NAME, oldFirstName, firstName));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Gender getGender() {
+		return gender;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setGender(Gender newGender) {
+		final Gender oldGender = gender;
+		gender = newGender == null ? GENDER_EDEFAULT : newGender;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, TestPackage.PERSON__GENDER, oldGender, gender));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getLastName() {
+		return lastName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setLastName(String newLastName) {
+		final String oldLastName = lastName;
+		lastName = newLastName;
+		if (eNotificationRequired()) {
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, TestPackage.PERSON__LAST_NAME, oldLastName, lastName));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getCustom() {
+		return custom;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setCustom(String newCustom) {
+		final String oldCustom = custom;
+		custom = newCustom;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, TestPackage.PERSON__CUSTOM, oldCustom, custom));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Integer getAge() {
+		return age;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setAge(Integer newAge) {
+		final Integer oldAge = age;
+		age = newAge;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, TestPackage.PERSON__AGE, oldAge, age));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case TestPackage.PERSON__FIRST_NAME:
+			return getFirstName();
+		case TestPackage.PERSON__GENDER:
+			return getGender();
+		case TestPackage.PERSON__LAST_NAME:
+			return getLastName();
+		case TestPackage.PERSON__CUSTOM:
+			return getCustom();
+		case TestPackage.PERSON__AGE:
+			return getAge();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case TestPackage.PERSON__FIRST_NAME:
+			setFirstName((String) newValue);
+			return;
+		case TestPackage.PERSON__GENDER:
+			setGender((Gender) newValue);
+			return;
+		case TestPackage.PERSON__LAST_NAME:
+			setLastName((String) newValue);
+			return;
+		case TestPackage.PERSON__CUSTOM:
+			setCustom((String) newValue);
+			return;
+		case TestPackage.PERSON__AGE:
+			setAge((Integer) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case TestPackage.PERSON__FIRST_NAME:
+			setFirstName(FIRST_NAME_EDEFAULT);
+			return;
+		case TestPackage.PERSON__GENDER:
+			setGender(GENDER_EDEFAULT);
+			return;
+		case TestPackage.PERSON__LAST_NAME:
+			setLastName(LAST_NAME_EDEFAULT);
+			return;
+		case TestPackage.PERSON__CUSTOM:
+			setCustom(CUSTOM_EDEFAULT);
+			return;
+		case TestPackage.PERSON__AGE:
+			setAge(AGE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case TestPackage.PERSON__FIRST_NAME:
+			return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName);
+		case TestPackage.PERSON__GENDER:
+			return gender != GENDER_EDEFAULT;
+		case TestPackage.PERSON__LAST_NAME:
+			return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
+		case TestPackage.PERSON__CUSTOM:
+			return CUSTOM_EDEFAULT == null ? custom != null : !CUSTOM_EDEFAULT.equals(custom);
+		case TestPackage.PERSON__AGE:
+			return AGE_EDEFAULT == null ? age != null : !AGE_EDEFAULT.equals(age);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) {
+			return super.toString();
+		}
+
+		final StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (firstName: ");
+		result.append(firstName);
+		result.append(", gender: ");
+		result.append(gender);
+		result.append(", lastName: ");
+		result.append(lastName);
+		result.append(", custom: ");
+		result.append(custom);
+		result.append(", age: ");
+		result.append(age);
+		result.append(')');
+		return result.toString();
+	}
+
+} // PersonImpl
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestFactoryImpl.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestFactoryImpl.java
index 07ddb38d01..78bd102ae1 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestFactoryImpl.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestFactoryImpl.java
@@ -12,18 +12,22 @@
 package org.eclipse.emf.ecp.view.validation.test.model.impl;
 
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.emf.ecp.view.validation.test.model.Book;
+import org.eclipse.emf.ecp.view.validation.test.model.Color;
 import org.eclipse.emf.ecp.view.validation.test.model.Computer;
 import org.eclipse.emf.ecp.view.validation.test.model.Content;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent;
+import org.eclipse.emf.ecp.view.validation.test.model.Gender;
 import org.eclipse.emf.ecp.view.validation.test.model.Librarian;
 import org.eclipse.emf.ecp.view.validation.test.model.Library;
 import org.eclipse.emf.ecp.view.validation.test.model.Mainboard;
+import org.eclipse.emf.ecp.view.validation.test.model.Person;
 import org.eclipse.emf.ecp.view.validation.test.model.PowerBlock;
 import org.eclipse.emf.ecp.view.validation.test.model.Referencer;
 import org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild;
@@ -126,6 +130,8 @@ public class TestFactoryImpl extends EFactoryImpl implements TestFactory {
 			return createCrossReferenceContainer();
 		case TestPackage.CROSS_REFERENCE_CONTENT:
 			return createCrossReferenceContent();
+		case TestPackage.PERSON:
+			return createPerson();
 		default:
 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -138,6 +144,70 @@ public class TestFactoryImpl extends EFactoryImpl implements TestFactory {
 	 * @generated
 	 */
 	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+		case TestPackage.GENDER:
+			return createGenderFromString(eDataType, initialValue);
+		case TestPackage.COLOR:
+			return createColorFromString(eDataType, initialValue);
+		case TestPackage.STRING_WITH_MAX_LENGTH8:
+			return createStringWithMaxLength8FromString(eDataType, initialValue);
+		case TestPackage.ONLY_CAPITALS:
+			return createOnlyCapitalsFromString(eDataType, initialValue);
+		case TestPackage.CUSTOM_DATA_TYPE:
+			return createCustomDataTypeFromString(eDataType, initialValue);
+		case TestPackage.PHONE_NUMBER:
+			return createPhoneNumberFromString(eDataType, initialValue);
+		case TestPackage.MIN_LENGTH_OF3:
+			return createMinLengthOf3FromString(eDataType, initialValue);
+		case TestPackage.STRICT_MIN_LENGTH_OF3:
+			return createStrictMinLengthOf3FromString(eDataType, initialValue);
+		case TestPackage.AGE:
+			return createAgeFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+		case TestPackage.GENDER:
+			return convertGenderToString(eDataType, instanceValue);
+		case TestPackage.COLOR:
+			return convertColorToString(eDataType, instanceValue);
+		case TestPackage.STRING_WITH_MAX_LENGTH8:
+			return convertStringWithMaxLength8ToString(eDataType, instanceValue);
+		case TestPackage.ONLY_CAPITALS:
+			return convertOnlyCapitalsToString(eDataType, instanceValue);
+		case TestPackage.CUSTOM_DATA_TYPE:
+			return convertCustomDataTypeToString(eDataType, instanceValue);
+		case TestPackage.PHONE_NUMBER:
+			return convertPhoneNumberToString(eDataType, instanceValue);
+		case TestPackage.MIN_LENGTH_OF3:
+			return convertMinLengthOf3ToString(eDataType, instanceValue);
+		case TestPackage.STRICT_MIN_LENGTH_OF3:
+			return convertStrictMinLengthOf3ToString(eDataType, instanceValue);
+		case TestPackage.AGE:
+			return convertAgeToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public Library createLibrary() {
 		final LibraryImpl library = new LibraryImpl();
 		return library;
@@ -378,6 +448,208 @@ public class TestFactoryImpl extends EFactoryImpl implements TestFactory {
 	 * @generated
 	 */
 	@Override
+	public Person createPerson() {
+		final PersonImpl person = new PersonImpl();
+		return person;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String createStringWithMaxLength8FromString(EDataType eDataType, String initialValue) {
+		return (String) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertStringWithMaxLength8ToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String createOnlyCapitalsFromString(EDataType eDataType, String initialValue) {
+		return (String) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertOnlyCapitalsToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String createCustomDataTypeFromString(EDataType eDataType, String initialValue) {
+		return (String) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertCustomDataTypeToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String createPhoneNumberFromString(EDataType eDataType, String initialValue) {
+		return (String) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertPhoneNumberToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String createMinLengthOf3FromString(EDataType eDataType, String initialValue) {
+		return (String) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertMinLengthOf3ToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String createStrictMinLengthOf3FromString(EDataType eDataType, String initialValue) {
+		return (String) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertStrictMinLengthOf3ToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Integer createAgeFromString(EDataType eDataType, String initialValue) {
+		return (Integer) super.createFromString(eDataType, initialValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertAgeToString(EDataType eDataType, Object instanceValue) {
+		return super.convertToString(eDataType, instanceValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Gender createGenderFromString(EDataType eDataType, String initialValue) {
+		final Gender result = Gender.get(initialValue);
+		if (result == null) {
+			throw new IllegalArgumentException(
+				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertGenderToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public Color createColorFromString(EDataType eDataType, String initialValue) {
+		final Color result = Color.get(initialValue);
+		if (result == null) {
+			throw new IllegalArgumentException(
+				"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public String convertColorToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public TestPackage getTestPackage() {
 		return (TestPackage) getEPackage();
 	}
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestPackageImpl.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestPackageImpl.java
index 3920ff9c63..a757c4e19b 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestPackageImpl.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/TestPackageImpl.java
@@ -15,6 +15,8 @@ import static org.eclipse.emf.ecp.view.validation.test.model.TestPackage.CONTAIN
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EGenericType;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
@@ -22,13 +24,16 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
 import org.eclipse.emf.ecp.view.validation.test.model.Book;
+import org.eclipse.emf.ecp.view.validation.test.model.Color;
 import org.eclipse.emf.ecp.view.validation.test.model.Computer;
 import org.eclipse.emf.ecp.view.validation.test.model.Content;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent;
+import org.eclipse.emf.ecp.view.validation.test.model.Gender;
 import org.eclipse.emf.ecp.view.validation.test.model.Librarian;
 import org.eclipse.emf.ecp.view.validation.test.model.Library;
 import org.eclipse.emf.ecp.view.validation.test.model.Mainboard;
+import org.eclipse.emf.ecp.view.validation.test.model.Person;
 import org.eclipse.emf.ecp.view.validation.test.model.PowerBlock;
 import org.eclipse.emf.ecp.view.validation.test.model.Referencer;
 import org.eclipse.emf.ecp.view.validation.test.model.TableContent;
@@ -222,6 +227,86 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 	private EClass crossReferenceContentEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EClass personEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EEnum genderEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EEnum colorEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType stringWithMaxLength8EDataType = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType onlyCapitalsEDataType = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType customDataTypeEDataType = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType phoneNumberEDataType = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType minLengthOf3EDataType = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType strictMinLengthOf3EDataType = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	private EDataType ageEDataType = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
 	 * EPackage.Registry} by the package
 	 * package URI value.
@@ -357,6 +442,17 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 	 * @generated
 	 */
 	@Override
+	public EAttribute getLibrary_PhoneNumber() {
+		return (EAttribute) libraryEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EClass getWriter() {
 		return writerEClass;
 	}
@@ -445,6 +541,28 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 	 * @generated
 	 */
 	@Override
+	public EAttribute getWriter_Initials() {
+		return (EAttribute) writerEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getWriter_Title() {
+		return (EAttribute) writerEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EClass getBook() {
 		return bookEClass;
 	}
@@ -555,6 +673,17 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 	 * @generated
 	 */
 	@Override
+	public EAttribute getComputer_Colors() {
+		return (EAttribute) computerEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public EClass getMainboard() {
 		return mainboardEClass;
 	}
@@ -962,6 +1091,171 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 	 * @generated
 	 */
 	@Override
+	public EClass getPerson() {
+		return personEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPerson_FirstName() {
+		return (EAttribute) personEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPerson_Gender() {
+		return (EAttribute) personEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPerson_LastName() {
+		return (EAttribute) personEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPerson_Custom() {
+		return (EAttribute) personEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EAttribute getPerson_Age() {
+		return (EAttribute) personEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getStringWithMaxLength8() {
+		return stringWithMaxLength8EDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getOnlyCapitals() {
+		return onlyCapitalsEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getCustomDataType() {
+		return customDataTypeEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getPhoneNumber() {
+		return phoneNumberEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getMinLengthOf3() {
+		return minLengthOf3EDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getStrictMinLengthOf3() {
+		return strictMinLengthOf3EDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EDataType getAge() {
+		return ageEDataType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EEnum getGender() {
+		return genderEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public EEnum getColor() {
+		return colorEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
 	public TestFactory getTestFactory() {
 		return (TestFactory) getEFactoryInstance();
 	}
@@ -994,6 +1288,7 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		createEReference(libraryEClass, LIBRARY__WRITERS);
 		createEReference(libraryEClass, LIBRARY__BOOKS);
 		createEReference(libraryEClass, LIBRARY__LIBRARIAN);
+		createEAttribute(libraryEClass, LIBRARY__PHONE_NUMBER);
 
 		writerEClass = createEClass(WRITER);
 		createEAttribute(writerEClass, WRITER__FIRST_NAME);
@@ -1003,6 +1298,8 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		createEReference(writerEClass, WRITER__BOOKS);
 		createEAttribute(writerEClass, WRITER__PSEUDONYM);
 		createEReference(writerEClass, WRITER__LIBRARY);
+		createEAttribute(writerEClass, WRITER__INITIALS);
+		createEAttribute(writerEClass, WRITER__TITLE);
 
 		bookEClass = createEClass(BOOK);
 		createEAttribute(bookEClass, BOOK__TITLE);
@@ -1016,6 +1313,7 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		createEReference(computerEClass, COMPUTER__MAINBOARD);
 		createEAttribute(computerEClass, COMPUTER__NAME);
 		createEReference(computerEClass, COMPUTER__POWER_BLOCK);
+		createEAttribute(computerEClass, COMPUTER__COLORS);
 
 		mainboardEClass = createEClass(MAINBOARD);
 		createEAttribute(mainboardEClass, MAINBOARD__NAME);
@@ -1069,6 +1367,26 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		crossReferenceContentEClass = createEClass(CROSS_REFERENCE_CONTENT);
 		createEReference(crossReferenceContentEClass, CROSS_REFERENCE_CONTENT__PARENT);
 		createEReference(crossReferenceContentEClass, CROSS_REFERENCE_CONTENT__SINGLE_PARENT);
+
+		personEClass = createEClass(PERSON);
+		createEAttribute(personEClass, PERSON__FIRST_NAME);
+		createEAttribute(personEClass, PERSON__GENDER);
+		createEAttribute(personEClass, PERSON__LAST_NAME);
+		createEAttribute(personEClass, PERSON__CUSTOM);
+		createEAttribute(personEClass, PERSON__AGE);
+
+		// Create enums
+		genderEEnum = createEEnum(GENDER);
+		colorEEnum = createEEnum(COLOR);
+
+		// Create data types
+		stringWithMaxLength8EDataType = createEDataType(STRING_WITH_MAX_LENGTH8);
+		onlyCapitalsEDataType = createEDataType(ONLY_CAPITALS);
+		customDataTypeEDataType = createEDataType(CUSTOM_DATA_TYPE);
+		phoneNumberEDataType = createEDataType(PHONE_NUMBER);
+		minLengthOf3EDataType = createEDataType(MIN_LENGTH_OF3);
+		strictMinLengthOf3EDataType = createEDataType(STRICT_MIN_LENGTH_OF3);
+		ageEDataType = createEDataType(AGE);
 	}
 
 	/**
@@ -1112,15 +1430,17 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		initEClass(libraryEClass, Library.class, "Library", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getLibrary_Name(), ecorePackage.getEString(), "name", null, 0, 1, Library.class, !IS_TRANSIENT,
 			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLibrary_Writers(), getWriter(), getWriter_Library(), "writers", null, 1, -1, Library.class,
-			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-			!IS_DERIVED, IS_ORDERED);
+		initEReference(getLibrary_Writers(), getWriter(), getWriter_Library(), "writers", null, 1, -1,
+			Library.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getLibrary_Books(), getBook(), null, "books", null, 0, -1, Library.class, !IS_TRANSIENT,
 			!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
 			IS_ORDERED);
 		initEReference(getLibrary_Librarian(), getLibrarian(), null, "librarian", null, 0, 1, Library.class,
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getLibrary_PhoneNumber(), getPhoneNumber(), "phoneNumber", null, 0, 1, Library.class,
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		EOperation op = addEOperation(libraryEClass, ecorePackage.getEBoolean(), "validate", 0, 1, IS_UNIQUE,
 			IS_ORDERED);
@@ -1146,9 +1466,13 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 			!IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWriter_Pseudonym(), ecorePackage.getEBoolean(), "Pseudonym", "false", 0, 1, Writer.class,
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getWriter_Library(), getLibrary(), getLibrary_Writers(), "library", null, 0, 1, Writer.class,
-			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-			!IS_DERIVED, IS_ORDERED);
+		initEReference(getWriter_Library(), getLibrary(), getLibrary_Writers(), "library", null, 0, 1,
+			Writer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWriter_Initials(), getMinLengthOf3(), "initials", null, 0, 1, Writer.class,
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWriter_Title(), getStrictMinLengthOf3(), "title", null, 0, 1, Writer.class,
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		op = addEOperation(writerEClass, ecorePackage.getEBoolean(), "validate", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostic", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -1201,6 +1525,8 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		initEReference(getComputer_PowerBlock(), getPowerBlock(), null, "powerBlock", null, 0, 1, Computer.class,
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getComputer_Colors(), getColor(), "colors", null, 0, -1, Computer.class, !IS_TRANSIENT,
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(mainboardEClass, Mainboard.class, "Mainboard", !IS_ABSTRACT, !IS_INTERFACE,
 			IS_GENERATED_INSTANCE_CLASS);
@@ -1267,14 +1593,14 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 
 		initEClass(tableContentWithInnerChild2EClass, TableContentWithInnerChild2.class, "TableContentWithInnerChild2",
 			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTableContentWithInnerChild2_InnerChild(), getTableContent(), null, "innerChild", null, 0, 1,
-			TableContentWithInnerChild2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+		initEReference(getTableContentWithInnerChild2_InnerChild(), getTableContent(), null, "innerChild", null, 0,
+			1, TableContentWithInnerChild2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
 			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(tableContentWithInnerChildEClass, TableContentWithInnerChild.class, "TableContentWithInnerChild",
 			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTableContentWithInnerChild_InnerChild(), getTableContent(), null, "innerChild", null, 0, 1,
-			TableContentWithInnerChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+		initEReference(getTableContentWithInnerChild_InnerChild(), getTableContent(), null, "innerChild", null, 0,
+			1, TableContentWithInnerChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
 			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getTableContentWithInnerChild_Stuff(), ecorePackage.getEString(), "stuff", null, 0, 1,
 			TableContentWithInnerChild.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
@@ -1282,8 +1608,8 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 
 		initEClass(tableWithoutMultiplicityConcreteEClass, TableWithoutMultiplicityConcrete.class,
 			"TableWithoutMultiplicityConcrete", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTableWithoutMultiplicityConcrete_Content(), getTableContentWithInnerChild(), null, "content",
-			null, 0, -1, TableWithoutMultiplicityConcrete.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+		initEReference(getTableWithoutMultiplicityConcrete_Content(), getTableContentWithInnerChild(), null,
+			"content", null, 0, -1, TableWithoutMultiplicityConcrete.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
 			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(referencerEClass, Referencer.class, "Referencer", !IS_ABSTRACT, !IS_INTERFACE,
@@ -1295,9 +1621,9 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		initEClass(crossReferenceContainerEClass, CrossReferenceContainer.class, "CrossReferenceContainer",
 			!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCrossReferenceContainer_Contents(), getCrossReferenceContent(),
-			getCrossReferenceContent_Parent(), "contents", null, 0, -1, CrossReferenceContainer.class, !IS_TRANSIENT,
-			!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-			IS_ORDERED);
+			getCrossReferenceContent_Parent(), "contents", null, 0, -1, CrossReferenceContainer.class,
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 		initEReference(getCrossReferenceContainer_SingleContent(), getCrossReferenceContent(),
 			getCrossReferenceContent_SingleParent(), "singleContent", null, 0, 1, CrossReferenceContainer.class,
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
@@ -1306,16 +1632,101 @@ public class TestPackageImpl extends EPackageImpl implements TestPackage {
 		initEClass(crossReferenceContentEClass, CrossReferenceContent.class, "CrossReferenceContent", !IS_ABSTRACT,
 			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCrossReferenceContent_Parent(), getCrossReferenceContainer(),
-			getCrossReferenceContainer_Contents(), "parent", null, 0, 1, CrossReferenceContent.class, !IS_TRANSIENT,
-			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-			IS_ORDERED);
+			getCrossReferenceContainer_Contents(), "parent", null, 0, 1, CrossReferenceContent.class,
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 		initEReference(getCrossReferenceContent_SingleParent(), getCrossReferenceContainer(),
 			getCrossReferenceContainer_SingleContent(), "singleParent", null, 0, 1, CrossReferenceContent.class,
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 
+		initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPerson_FirstName(), getStringWithMaxLength8(), "firstName", null, 0, 1, Person.class,
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPerson_Gender(), getGender(), "gender", null, 0, 1, Person.class, !IS_TRANSIENT,
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPerson_LastName(), getOnlyCapitals(), "lastName", null, 0, 1, Person.class,
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPerson_Custom(), getCustomDataType(), "custom", null, 0, 1, Person.class, !IS_TRANSIENT,
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPerson_Age(), getAge(), "age", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE,
+			IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(genderEEnum, Gender.class, "Gender");
+		addEEnumLiteral(genderEEnum, Gender.MALE);
+		addEEnumLiteral(genderEEnum, Gender.FEMALE);
+		addEEnumLiteral(genderEEnum, Gender.BOTH);
+
+		initEEnum(colorEEnum, Color.class, "Color");
+		addEEnumLiteral(colorEEnum, Color.RED);
+		addEEnumLiteral(colorEEnum, Color.GREEN);
+		addEEnumLiteral(colorEEnum, Color.BLUE);
+
+		// Initialize data types
+		initEDataType(stringWithMaxLength8EDataType, String.class, "StringWithMaxLength8", IS_SERIALIZABLE,
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(onlyCapitalsEDataType, String.class, "OnlyCapitals", IS_SERIALIZABLE,
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(customDataTypeEDataType, String.class, "CustomDataType", IS_SERIALIZABLE,
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(phoneNumberEDataType, String.class, "PhoneNumber", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(minLengthOf3EDataType, String.class, "MinLengthOf3", IS_SERIALIZABLE,
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(strictMinLengthOf3EDataType, String.class, "StrictMinLengthOf3", IS_SERIALIZABLE,
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(ageEDataType, Integer.class, "Age", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+
 		// Create resource
 		createResource(eNS_URI);
+
+		// Create annotations
+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+		createExtendedMetaDataAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	protected void createExtendedMetaDataAnnotations() {
+		final String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
+		addAnnotation(stringWithMaxLength8EDataType,
+			source,
+			new String[] {
+				"maxLength", "8"
+			});
+		addAnnotation(onlyCapitalsEDataType,
+			source,
+			new String[] {
+				"pattern", "[A-Z]+"
+			});
+		addAnnotation(phoneNumberEDataType,
+			source,
+			new String[] {
+				"pattern", "((\\+)?[a-c0-9*#]{1,20}){0,1}",
+				"loosePattern", "[+0-9]+"
+			});
+		addAnnotation(minLengthOf3EDataType,
+			source,
+			new String[] {
+				"minLength", "3",
+				"looseMinLength", "0"
+			});
+		addAnnotation(strictMinLengthOf3EDataType,
+			source,
+			new String[] {
+				"minLength", "3"
+			});
+		addAnnotation(ageEDataType,
+			source,
+			new String[] {
+				"minInclusive", "0",
+				"maxInclusive", "100"
+			});
 	}
 
 } // TestPackageImpl
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/WriterImpl.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/WriterImpl.java
index fad6e16a15..9c5505b350 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/WriterImpl.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/impl/WriterImpl.java
@@ -49,6 +49,8 @@ import org.eclipse.emf.ecp.view.validation.test.model.util.TestValidator;
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl#getBooks <em>Books</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl#isPseudonym <em>Pseudonym</em>}</li>
  * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl#getLibrary <em>Library</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl#getInitials <em>Initials</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.validation.test.model.impl.WriterImpl#getTitle <em>Title</em>}</li>
  * </ul>
  *
  * @generated
@@ -176,6 +178,50 @@ public class WriterImpl extends EObjectImpl implements Writer {
 	protected boolean pseudonym = PSEUDONYM_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #getInitials() <em>Initials</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getInitials()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String INITIALS_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getInitials() <em>Initials</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getInitials()
+	 * @generated
+	 * @ordered
+	 */
+	protected String initials = INITIALS_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String TITLE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @see #getTitle()
+	 * @generated
+	 * @ordered
+	 */
+	protected String title = TITLE_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -401,6 +447,58 @@ public class WriterImpl extends EObjectImpl implements Writer {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getInitials() {
+		return initials;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setInitials(String newInitials) {
+		final String oldInitials = initials;
+		initials = newInitials;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, TestPackage.WRITER__INITIALS, oldInitials, initials));
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	@Override
+	public void setTitle(String newTitle) {
+		final String oldTitle = title;
+		title = newTitle;
+		if (eNotificationRequired()) {
+			eNotify(new ENotificationImpl(this, Notification.SET, TestPackage.WRITER__TITLE, oldTitle, title));
+		}
+	}
+
+	/**
 	 * Validates the writer. Only adds one diagnostic item to the chain.
 	 *
 	 * @generated NOT
@@ -564,6 +662,10 @@ public class WriterImpl extends EObjectImpl implements Writer {
 			return isPseudonym();
 		case TestPackage.WRITER__LIBRARY:
 			return getLibrary();
+		case TestPackage.WRITER__INITIALS:
+			return getInitials();
+		case TestPackage.WRITER__TITLE:
+			return getTitle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -600,6 +702,12 @@ public class WriterImpl extends EObjectImpl implements Writer {
 		case TestPackage.WRITER__LIBRARY:
 			setLibrary((Library) newValue);
 			return;
+		case TestPackage.WRITER__INITIALS:
+			setInitials((String) newValue);
+			return;
+		case TestPackage.WRITER__TITLE:
+			setTitle((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -634,6 +742,12 @@ public class WriterImpl extends EObjectImpl implements Writer {
 		case TestPackage.WRITER__LIBRARY:
 			setLibrary((Library) null);
 			return;
+		case TestPackage.WRITER__INITIALS:
+			setInitials(INITIALS_EDEFAULT);
+			return;
+		case TestPackage.WRITER__TITLE:
+			setTitle(TITLE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -661,6 +775,10 @@ public class WriterImpl extends EObjectImpl implements Writer {
 			return pseudonym != PSEUDONYM_EDEFAULT;
 		case TestPackage.WRITER__LIBRARY:
 			return getLibrary() != null;
+		case TestPackage.WRITER__INITIALS:
+			return INITIALS_EDEFAULT == null ? initials != null : !INITIALS_EDEFAULT.equals(initials);
+		case TestPackage.WRITER__TITLE:
+			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -688,6 +806,10 @@ public class WriterImpl extends EObjectImpl implements Writer {
 		result.append(birthDate);
 		result.append(", Pseudonym: ");
 		result.append(pseudonym);
+		result.append(", initials: ");
+		result.append(initials);
+		result.append(", title: ");
+		result.append(title);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestAdapterFactory.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestAdapterFactory.java
index ea8036b275..17066dc254 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestAdapterFactory.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestAdapterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent;
 import org.eclipse.emf.ecp.view.validation.test.model.Librarian;
 import org.eclipse.emf.ecp.view.validation.test.model.Library;
 import org.eclipse.emf.ecp.view.validation.test.model.Mainboard;
+import org.eclipse.emf.ecp.view.validation.test.model.Person;
 import org.eclipse.emf.ecp.view.validation.test.model.PowerBlock;
 import org.eclipse.emf.ecp.view.validation.test.model.Referencer;
 import org.eclipse.emf.ecp.view.validation.test.model.TableContent;
@@ -205,6 +206,11 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
+		public Adapter casePerson(Person object) {
+			return createPersonAdapter();
+		}
+
+		@Override
 		public Adapter defaultCase(EObject object) {
 			return createEObjectAdapter();
 		}
@@ -369,8 +375,8 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithMultiplicity <em>Table With Multiplicity</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithMultiplicity <em>Table With Multiplicity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -401,9 +407,9 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation
-	 * <em>Table Content Without Validation</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithoutValidation <em>Table Content Without
+	 * Validation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -418,9 +424,9 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation
-	 * <em>Table Content With Validation</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithValidation <em>Table Content With
+	 * Validation</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -435,9 +441,9 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicity
-	 * <em>Table Without Multiplicity</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicity <em>Table Without
+	 * Multiplicity</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -452,8 +458,8 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithUnique <em>Table With Unique</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithUnique <em>Table With Unique</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -468,9 +474,9 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2
-	 * <em>Table Content With Inner Child2</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild2 <em>Table Content With Inner
+	 * Child2</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -485,9 +491,9 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild
-	 * <em>Table Content With Inner Child</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableContentWithInnerChild <em>Table Content With Inner
+	 * Child</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -502,9 +508,9 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete
-	 * <em>Table Without Multiplicity Concrete</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.TableWithoutMultiplicityConcrete <em>Table Without
+	 * Multiplicity Concrete</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -535,9 +541,9 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer <em>Cross Reference Container</em>}
-	 * '.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer <em>Cross Reference
+	 * Container</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -552,8 +558,8 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent <em>Cross Reference Content</em>}'.
+	 * Creates a new adapter for an object of class
+	 * '{@link org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent <em>Cross Reference Content</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -568,6 +574,22 @@ public class TestAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.validation.test.model.Person
+	 * <em>Person</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 *
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.ecp.view.validation.test.model.Person
+	 * @generated
+	 */
+	public Adapter createPersonAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestSwitch.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestSwitch.java
index 68558c1b93..a14d89d4d1 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestSwitch.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestSwitch.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent;
 import org.eclipse.emf.ecp.view.validation.test.model.Librarian;
 import org.eclipse.emf.ecp.view.validation.test.model.Library;
 import org.eclipse.emf.ecp.view.validation.test.model.Mainboard;
+import org.eclipse.emf.ecp.view.validation.test.model.Person;
 import org.eclipse.emf.ecp.view.validation.test.model.PowerBlock;
 import org.eclipse.emf.ecp.view.validation.test.model.Referencer;
 import org.eclipse.emf.ecp.view.validation.test.model.TableContent;
@@ -280,6 +281,14 @@ public class TestSwitch<T> extends Switch<T> {
 			}
 			return result;
 		}
+		case TestPackage.PERSON: {
+			final Person person = (Person) theEObject;
+			T result = casePerson(person);
+			if (result == null) {
+				result = defaultCase(theEObject);
+			}
+			return result;
+		}
 		default:
 			return defaultCase(theEObject);
 		}
@@ -622,6 +631,22 @@ public class TestSwitch<T> extends Switch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Person</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 *
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Person</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T casePerson(Person object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestValidator.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestValidator.java
index 0c27d4bf20..f5c50be2e4 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestValidator.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/model/util/TestValidator.java
@@ -26,16 +26,20 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
 import org.eclipse.emf.ecp.view.internal.validation.ValidationNotification;
 import org.eclipse.emf.ecp.view.validation.test.model.Book;
+import org.eclipse.emf.ecp.view.validation.test.model.Color;
 import org.eclipse.emf.ecp.view.validation.test.model.Computer;
 import org.eclipse.emf.ecp.view.validation.test.model.Container;
 import org.eclipse.emf.ecp.view.validation.test.model.Content;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContainer;
 import org.eclipse.emf.ecp.view.validation.test.model.CrossReferenceContent;
+import org.eclipse.emf.ecp.view.validation.test.model.Gender;
 import org.eclipse.emf.ecp.view.validation.test.model.Librarian;
 import org.eclipse.emf.ecp.view.validation.test.model.Library;
 import org.eclipse.emf.ecp.view.validation.test.model.Mainboard;
+import org.eclipse.emf.ecp.view.validation.test.model.Person;
 import org.eclipse.emf.ecp.view.validation.test.model.PowerBlock;
 import org.eclipse.emf.ecp.view.validation.test.model.Referencer;
 import org.eclipse.emf.ecp.view.validation.test.model.TableContent;
@@ -212,6 +216,26 @@ public class TestValidator extends EObjectValidator {
 			return validateCrossReferenceContainer((CrossReferenceContainer) value, diagnostics, context);
 		case TestPackage.CROSS_REFERENCE_CONTENT:
 			return validateCrossReferenceContent((CrossReferenceContent) value, diagnostics, context);
+		case TestPackage.PERSON:
+			return validatePerson((Person) value, diagnostics, context);
+		case TestPackage.GENDER:
+			return validateGender((Gender) value, diagnostics, context);
+		case TestPackage.COLOR:
+			return validateColor((Color) value, diagnostics, context);
+		case TestPackage.STRING_WITH_MAX_LENGTH8:
+			return validateStringWithMaxLength8((String) value, diagnostics, context);
+		case TestPackage.ONLY_CAPITALS:
+			return validateOnlyCapitals((String) value, diagnostics, context);
+		case TestPackage.CUSTOM_DATA_TYPE:
+			return validateCustomDataType((String) value, diagnostics, context);
+		case TestPackage.PHONE_NUMBER:
+			return validatePhoneNumber((String) value, diagnostics, context);
+		case TestPackage.MIN_LENGTH_OF3:
+			return validateMinLengthOf3((String) value, diagnostics, context);
+		case TestPackage.STRICT_MIN_LENGTH_OF3:
+			return validateStrictMinLengthOf3((String) value, diagnostics, context);
+		case TestPackage.AGE:
+			return validateAge((Integer) value, diagnostics, context);
 		default:
 			return true;
 		}
@@ -660,6 +684,272 @@ public class TestValidator extends EObjectValidator {
 		return validate_EveryDefaultConstraint(crossReferenceContent, diagnostics, context);
 	}
 
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validatePerson(Person person, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(person, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateGender(Gender gender, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateColor(Color color, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateStringWithMaxLength8(String stringWithMaxLength8, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		final boolean result = validateStringWithMaxLength8_MaxLength(stringWithMaxLength8, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * Validates the MaxLength constraint of '<em>String With Max Length8</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateStringWithMaxLength8_MaxLength(String stringWithMaxLength8, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		final int length = stringWithMaxLength8.length();
+		final boolean result = length <= 8;
+		if (!result && diagnostics != null) {
+			reportMaxLengthViolation(TestPackage.Literals.STRING_WITH_MAX_LENGTH8, stringWithMaxLength8, length, 8,
+				diagnostics, context);
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateOnlyCapitals(String onlyCapitals, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		final boolean result = validateOnlyCapitals_Pattern(onlyCapitals, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @see #validateOnlyCapitals_Pattern
+	 */
+	public static final PatternMatcher[][] ONLY_CAPITALS__PATTERN__VALUES = new PatternMatcher[][] {
+		new PatternMatcher[] {
+			XMLTypeUtil.createPatternMatcher("[A-Z]+")
+		}
+	};
+
+	/**
+	 * Validates the Pattern constraint of '<em>Only Capitals</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateOnlyCapitals_Pattern(String onlyCapitals, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		return validatePattern(TestPackage.Literals.ONLY_CAPITALS, onlyCapitals, ONLY_CAPITALS__PATTERN__VALUES,
+			diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateCustomDataType(String customDataType, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validatePhoneNumber(String phoneNumber, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		final boolean result = validatePhoneNumber_Pattern(phoneNumber, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @see #validatePhoneNumber_Pattern
+	 */
+	public static final PatternMatcher[][] PHONE_NUMBER__PATTERN__VALUES = new PatternMatcher[][] {
+		new PatternMatcher[] {
+			XMLTypeUtil.createPatternMatcher("((\\+)?[a-c0-9*#]{1,20}){0,1}")
+		}
+	};
+
+	/**
+	 * Validates the Pattern constraint of '<em>Phone Number</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validatePhoneNumber_Pattern(String phoneNumber, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		return validatePattern(TestPackage.Literals.PHONE_NUMBER, phoneNumber, PHONE_NUMBER__PATTERN__VALUES,
+			diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateMinLengthOf3(String minLengthOf3, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		final boolean result = validateMinLengthOf3_MinLength(minLengthOf3, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * Validates the MinLength constraint of '<em>Min Length Of3</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateMinLengthOf3_MinLength(String minLengthOf3, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		final int length = minLengthOf3.length();
+		final boolean result = length >= 3;
+		if (!result && diagnostics != null) {
+			reportMinLengthViolation(TestPackage.Literals.MIN_LENGTH_OF3, minLengthOf3, length, 3, diagnostics,
+				context);
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateStrictMinLengthOf3(String strictMinLengthOf3, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		final boolean result = validateStrictMinLengthOf3_MinLength(strictMinLengthOf3, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * Validates the MinLength constraint of '<em>Strict Min Length Of3</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateStrictMinLengthOf3_MinLength(String strictMinLengthOf3, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
+		final int length = strictMinLengthOf3.length();
+		final boolean result = length >= 3;
+		if (!result && diagnostics != null) {
+			reportMinLengthViolation(TestPackage.Literals.STRICT_MIN_LENGTH_OF3, strictMinLengthOf3, length, 3,
+				diagnostics, context);
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateAge(Integer age, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		boolean result = validateAge_Min(age, diagnostics, context);
+		if (result || diagnostics != null) {
+			result &= validateAge_Max(age, diagnostics, context);
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @see #validateAge_Min
+	 */
+	public static final Integer AGE__MIN__VALUE = new Integer(0);
+
+	/**
+	 * Validates the Min constraint of '<em>Age</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateAge_Min(Integer age, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		final boolean result = age.compareTo(AGE__MIN__VALUE) >= 0;
+		if (!result && diagnostics != null) {
+			reportMinViolation(TestPackage.Literals.AGE, age, AGE__MIN__VALUE, true, diagnostics, context);
+		}
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 * @see #validateAge_Max
+	 */
+	public static final Integer AGE__MAX__VALUE = new Integer(100);
+
+	/**
+	 * Validates the Max constraint of '<em>Age</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated
+	 */
+	public boolean validateAge_Max(Integer age, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		final boolean result = age.compareTo(AGE__MAX__VALUE) <= 0;
+		if (!result && diagnostics != null) {
+			reportMaxViolation(TestPackage.Literals.AGE, age, AGE__MAX__VALUE, true, diagnostics, context);
+		}
+		return result;
+	}
+
 	private boolean validateUniqueness(TableWithUnique tableWithUnique, DiagnosticChain diagnostics,
 		Map<Object, Object> context) {
 		final EList<TableContent> contents = tableWithUnique.getContent();
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
index 86587d13c9..7831f4eed5 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for the VerticalSWT Renderer
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
index 1e0da10be9..57973860ea 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.vertical.ui.swt.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
index 2040082e6b..b58e37b1e5 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ViewProxy Tests
 Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.tests;singleton:=true
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.12.0",
- org.eclipse.emf.ecp.view.viewproxy.tests;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.13.0",
+ org.eclipse.emf.ecp.view.viewproxy.tests;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
index f63a7a92ae..4cf4dbfdad 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emf.ecp.view.viewproxy.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
index 78207a90d6..4cbd2d2fff 100644
--- a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Locale Tests
 Bundle-SymbolicName: org.eclipse.emfforms.common.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.common.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.common.locale;version="1.12.0"
+Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.common.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common.locale;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.common.tests/pom.xml b/tests/org.eclipse.emfforms.common.tests/pom.xml
index b1fdf9b6a3..493588c4ce 100644
--- a/tests/org.eclipse.emfforms.common.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.common.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.common.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
index 8d5a239269..19dfa7b908 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Databinding Services Featurepath Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath.tests;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
index 4cac220ce9..539aeeface 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.featurepath.tests</artifactId>
@@ -42,5 +42,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
index 6b7d1716da..96ca531b9a 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.index;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.index;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0]"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
index 53a44bcba9..57a25bb002 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.index.tests</artifactId>
@@ -27,5 +27,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emfforms</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
index 1adf1c6130..b8c4fb2127 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Databinding Services Integration Test
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.integrationtest
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
index b24bbb41e8..c1011bd488 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.integrationtest</artifactId>
@@ -52,5 +52,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
index f410848d18..1c16b8d71d 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
index 3f15177da8..993f02359a 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.keyattribute.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
index 78fb8bd036..05308c08cd 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Converter Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
index fef9e91ef5..5786e647a5 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.mapping.tests</artifactId>
@@ -27,5 +27,5 @@
 		</plugins>
 	</build>
 	<groupId>org.eclipse.emfforms</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
index 53315f9f47..9b4568e8ef 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.testmodel;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.12.0",
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.12.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.13.0",
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.13.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
index 913a8c7705..29549c1ba8 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<artifactId>org.eclipse.emfforms.core.services.databinding.testmodel</artifactId>
 	<packaging>eclipse-plugin</packaging>
 
 	<groupId>org.eclipse.emf.ecp</groupId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
index 83c7bef735..c4aa49d617 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Domain Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
index cb29ac99c0..0ea8c0742f 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.default.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
index 0a3507d0cb..1a8745463b 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Index DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
index 67b01a9051..b86e7df8e1 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.index.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
index a892f9a2fe..da2101135f 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: KeyAttribute DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
index 1c047b2ea5..7dbda2d10b 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
index ae3a7fd719..7b870d4882 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapping DMR Expander Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
index dc0b35e691..a25692daa8 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.domainexpander.mapping.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
index 4289811275..bd59e8f087 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Service EMF Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
index 6a0091fdb7..73b23326bf 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.emf.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
index dc431134e8..91712f0619 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Legacy Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy.tests;singleton:=true
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.legacy;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.legacy;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.common;version="[1.12.0,1.13.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.13.0,1.14.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
index a875bab5c5..b501ba3695 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.legacy.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
index 6712bed880..2be1e1572b 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Key Attribute Structural Change Tester Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.common;bundle-version="[2.11.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
index 36170ea0c2..0e772198b1 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
index 0aedae92c9..41c1d16060 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms Core Services Tests
 Bundle-SymbolicName: org.eclipse.emfforms.core.services.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.internal.core.services.scoped;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.tests;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.scoped;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.tests;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
index 0d37e59465..cd7521d728 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.core.services.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
@@ -26,6 +26,28 @@
 		          	<useUIThread>false</useUIThread>
 				</configuration>
 			</plugin>
+			
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.emf.ecp.viewmodel.feature</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<requirement>
+								<type>p2-installable-unit</type>
+								<id>org.eclipse.equinox.ds</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
+	
 </project>
diff --git a/tests/org.eclipse.emfforms.core.services.tests/src/org/eclipse/emfforms/internal/core/services/scoped/SettingToControlMapper_ITest.java b/tests/org.eclipse.emfforms.core.services.tests/src/org/eclipse/emfforms/internal/core/services/scoped/SettingToControlMapper_ITest.java
new file mode 100644
index 0000000000..e072e282e7
--- /dev/null
+++ b/tests/org.eclipse.emfforms.core.services.tests/src/org/eclipse/emfforms/internal/core/services/scoped/SettingToControlMapper_ITest.java
@@ -0,0 +1,173 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * 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:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.core.services.scoped;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.common.spi.UniqueSetting;
+import org.eclipse.emf.ecp.view.spi.model.ModelChangeListener;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emfforms.internal.core.services.controlmapper.SettingToControlMapperImpl;
+import org.eclipse.emfforms.spi.core.services.mappingprovider.EMFFormsMappingProviderManager;
+import org.eclipse.emfforms.spi.core.services.view.EMFFormsContextListener;
+import org.eclipse.emfforms.spi.core.services.view.EMFFormsViewContext;
+import org.eclipse.emfforms.spi.core.services.view.RootDomainModelChangeListener;
+import org.junit.Test;
+
+public class SettingToControlMapper_ITest {
+
+	private static final int NR_UPDATES = 100;
+	private static final int NR_RUNNABLES = 100;
+
+	@Test
+	public void updateMappingsConcurrently() throws InterruptedException {
+		// setup
+		final CountDownLatch latch = new CountDownLatch(NR_RUNNABLES);
+		final VControl control = VViewFactory.eINSTANCE.createControl();
+		final EObject domainObject = EcoreUtil.create(EcorePackage.eINSTANCE.getEClass());
+		final SettingToControlMapperImpl settingToControlMapper = new SettingToControlMapperImpl(
+			new EMFFormsMappingProviderManager() {
+				@Override
+				public Set<UniqueSetting> getAllSettingsFor(VDomainModelReference domainModelReference,
+					EObject domainObject) {
+					final Set<UniqueSetting> settings = new LinkedHashSet<UniqueSetting>();
+					settings.add(
+						UniqueSetting.createSetting(domainObject, EcorePackage.eINSTANCE.getEClass_EAttributes()));
+					return settings;
+				}
+			},
+			new FakeViewContext(domainObject, control));
+
+		final List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<Throwable>());
+		final ArrayList<Runnable> runnables = new ArrayList<Runnable>();
+		for (int i = 0; i < NR_RUNNABLES; i++) {
+			runnables.add(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						int j = 0;
+						while (j < NR_UPDATES) {
+							settingToControlMapper.updateControlMapping(control);
+							Thread.sleep(1);
+							j += 1;
+						}
+						// BEGIN SUPRESS CATCH EXCEPTION
+					} catch (final Exception exception) {
+						exceptions.add(exception);
+						// END SUPRESS CATCH EXCEPTION
+					} finally {
+						latch.countDown();
+					}
+
+				}
+			});
+		}
+		final ExecutorService newFixedThreadPool = Executors.newFixedThreadPool(runnables.size());
+
+		// act
+		for (final Runnable runnable : runnables) {
+			newFixedThreadPool.submit(runnable);
+		}
+
+		latch.await();
+
+		// assert
+		assertTrue(exceptions.isEmpty());
+	}
+
+	class FakeViewContext implements EMFFormsViewContext {
+
+		private final EObject domainObject;
+		private final VElement viewModel;
+
+		FakeViewContext(EObject domainObject, VElement viewModel) {
+			this.domainObject = domainObject;
+			this.viewModel = viewModel;
+		}
+
+		@Override
+		public void unregisterViewChangeListener(ModelChangeListener modelChangeListener) {
+		}
+
+		@Override
+		public void unregisterRootDomainModelChangeListener(
+			RootDomainModelChangeListener rootDomainModelChangeListener) {
+
+		}
+
+		@Override
+		public void unregisterEMFFormsContextListener(EMFFormsContextListener contextListener) {
+
+		}
+
+		@Override
+		public void unregisterDomainChangeListener(ModelChangeListener modelChangeListener) {
+
+		}
+
+		@Override
+		public void registerViewChangeListener(ModelChangeListener modelChangeListener) {
+
+		}
+
+		@Override
+		public void registerRootDomainModelChangeListener(
+			RootDomainModelChangeListener rootDomainModelChangeListener) {
+
+		}
+
+		@Override
+		public void registerEMFFormsContextListener(EMFFormsContextListener contextListener) {
+
+		}
+
+		@Override
+		public void registerDomainChangeListener(ModelChangeListener modelChangeListener) {
+
+		}
+
+		@Override
+		public VElement getViewModel() {
+			return viewModel;
+		}
+
+		@Override
+		public <T> T getService(Class<T> serviceType) {
+			return null;
+		}
+
+		@Override
+		public EObject getDomainModel() {
+			return domainObject;
+		}
+
+		@Override
+		public void changeDomainModel(EObject newDomainModel) {
+
+		}
+	}
+}
diff --git a/tests/org.eclipse.emfforms.core.services.tests/src/org/eclipse/emfforms/internal/core/services/tests/AllIntegrationTests.java b/tests/org.eclipse.emfforms.core.services.tests/src/org/eclipse/emfforms/internal/core/services/tests/AllIntegrationTests.java
index de0a4fde1d..ed80849b14 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/src/org/eclipse/emfforms/internal/core/services/tests/AllIntegrationTests.java
+++ b/tests/org.eclipse.emfforms.core.services.tests/src/org/eclipse/emfforms/internal/core/services/tests/AllIntegrationTests.java
@@ -12,12 +12,16 @@
 package org.eclipse.emfforms.internal.core.services.tests;
 
 import org.eclipse.emfforms.internal.core.services.scoped.EMFFormsScopedServicesFactoryImpl_ITest;
+import org.eclipse.emfforms.internal.core.services.scoped.SettingToControlMapper_ITest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ EMFFormsScopedServicesFactoryImpl_ITest.class })
+@SuiteClasses({
+	EMFFormsScopedServicesFactoryImpl_ITest.class,
+	SettingToControlMapper_ITest.class
+})
 public class AllIntegrationTests {
 
 }
diff --git a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
index 84c2731641..b0033f8fa4 100644
--- a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMF Forms Localization Tests
 Bundle-SymbolicName: org.eclipse.emfforms.localization.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.12.0"
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="4.11.0",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
  org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.localization.tests/pom.xml b/tests/org.eclipse.emfforms.localization.tests/pom.xml
index de005d1bec..c01455f74f 100644
--- a/tests/org.eclipse.emfforms.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.localization.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.localization.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
index ff93be5ce0..47a081b902 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Text Control with Autocomplete Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.12.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.13.0,1.14.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
index eca616deaf..84f9922b62 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.control.text.autocomplete.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
index 6f09083ed1..9b8bbaa696 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Control Grid SWT Renderer Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid.test
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.12.0"
+Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
index aea99a9b6e..29ab4513d0 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.controlgrid.test</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
index 102a35ff49..7d1e1d1bed 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT Core DI Extension Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension.tests;singleton:=true
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.12.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.13.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)"
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
index be4d093a80..851933b43a 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.di.extension.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
index a0c6ec0f57..f7a06dcda7 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core DI Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.tests
-Bundle-Version: 1.12.0.qualifier
+Bundle-Version: 1.13.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.12.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
- org.eclipse.emfforms.spi.swt.core.di;version="1.12.0"
-Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.13.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
+ org.eclipse.emfforms.spi.swt.core.di;version="1.13.0"
+Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.13.0,1.14.0)",
  org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.inject;version="1.0.0",
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
index f16e95db40..ed43f115f8 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.di.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
index 69c8cc36b6..e4d5d8b83e 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms SWT Core Tests
 Bundle-SymbolicName: org.eclipse.emfforms.swt.core.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.swt.core.tests;version="1.12.0";x-internal:=true
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.13.0,1.14.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.swt.core.tests;version="1.13.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
index c0b9b6af27..97d1d42d0e 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.swt.core.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
index 56d7bafa3d..7e65922e97 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EMFForms View Model Localization Tests
 Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization.tests
-Bundle-Version: 1.12.0.qualifier
-Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)"
+Bundle-Version: 1.13.0.qualifier
+Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.13.0,1.14.0)"
 Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.12.0";x-internal:=true,
- org.eclipse.emfforms.view.model.localization.tests;version="1.12.0"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.13.0";x-internal:=true,
+ org.eclipse.emfforms.view.model.localization.tests;version="1.13.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.13.0,1.14.0)"
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
index f56bb7775e..bfd002fa1d 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
@@ -6,12 +6,12 @@
 	<parent>
 		<groupId>org.eclipse.emf.ecp</groupId>
 		<artifactId>ecp-tests-parent</artifactId>
-		<version>1.12.0-SNAPSHOT</version>
+		<version>1.13.0-SNAPSHOT</version>
 		<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
 	</parent>
 	<groupId>org.eclipse.emf.ecp</groupId>
 	<artifactId>org.eclipse.emfforms.view.model.localization.tests</artifactId>
-	<version>1.12.0-SNAPSHOT</version>
+	<version>1.13.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 
 	<build>
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
index 9c95b11368..4b28940327 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
@@ -4,16 +4,16 @@ Bundle-Name: EMFForms Excel Table Tests
 Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.table.tests
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.spreadsheet.core.renderer.table;bundle-version="[1.0.0,2.0.0)"
+Fragment-Host: org.eclipse.emfforms.spreadsheet.core.renderer.table;bundle-version="[1.0.0,1.1.0)"
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.table;version="1.0.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.10.0,2.0.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.13.0,1.14.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
index c02df356fb..af9cb33eac 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2
 Bundle-Name: EMFForm Spreadsheet Core Test
 Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.tests
 Bundle-Version: 1.0.0.qualifier
-Fragment-Host: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)"
+Fragment-Host: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)"
 Export-Package: org.eclipse.emfforms.internal.spreadsheet.core;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.internal.spreadsheet.core.converter;version="1.0.0";x-internal:=true,
  org.eclipse.emfforms.spreadsheet.core.tests;version="1.0.0";x-internal:=true
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
index 9476f16357..43fff9a764 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
@@ -8,16 +8,16 @@ Export-Package: org.eclipse.emfforms.spreadsheet.integrationtest;version="1.0.0"
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.13.0,1.14.0)",
+ org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.13.0,1.14.0)",
  org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.core.runtime;version="3.5.0",
  org.osgi.framework;version="0.0.0"