Merge remote-tracking branch 'origin/release_1.23.0'
Change-Id: I7a6181470a7c5182db8fc30c550d5dc13ad17e66
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 a77c279..fbea65b 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 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.controls.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.fx.util;bundle-version="[1.8.0,1.9.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.application.e4.fx
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 9eb887c..39561cf 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 @@
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit,
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: com.ibm.icu.text;version="50.0.0"
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 8987746..7b8868c 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-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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.osgi.framework;version="1.3.0"
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 c02d0e6..ca258ee 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,10 +7,10 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.fx
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 cbbaa6f..64b04bc 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,8 +4,8 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.label.fx
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 ba38d71..6ffedd8 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 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.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 76b8a6a..44a7874 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-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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.util.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.fx.ui.controls;bundle-version="[2.0.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
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 e963bb9..82e0e48 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,10 +7,10 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.fx
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 51300b6..ec37a0e 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,6 +4,6 @@
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.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.viewmodel.fx
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 6f11486..3ecff9c 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 @@
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.util.fx;bundle-version="[1.23.0,1.24.0)",
org.eclipse.e4.ui.workbench,
- org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.util.e4.fx;bundle-version="[1.23.0,1.24.0)",
org.eclipse.fx.ui.controls;bundle-version="[2.0.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
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 c57f104..8d4cb48 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Demo Application Eclipse 3.x
Bundle-SymbolicName: org.eclipse.emf.ecp.application.e3;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.application3x;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.23.0,1.24.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 2b3c591..83559fb 100644
--- a/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 110b031..b7c5d51 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP e4 Application
Bundle-SymbolicName: org.eclipse.emf.ecp.application.e4;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.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,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.8
Automatic-Module-Name: org.eclipse.emf.ecp.application.e4
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 c2d1da5..5570004 100644
--- a/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 2043f11..8fdae29 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP CDO Model Repository Core
Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.core;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
+Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.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 8ca4e3c..917f2a6 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 6613c66..e8777d9 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: CDO Model Repository ECP UI
Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.cdo.internal.ui;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.cdo.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.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.8
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
index c0f55f2..2af2e58 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 0e5edf5..46bf839 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Change Broker Provider Bridge
Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.changebroker.provider
diff --git a/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
index 904d1ad..a9c833a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 671f9db..4934400 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Change Broker
Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.changebroker.spi;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.changebroker.spi;version="1.23.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.changebroker
diff --git a/bundles/org.eclipse.emf.ecp.changebroker/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
index 53b44b7..5a60594 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 895be28..05147a6 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common UI
Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.common.ui;version="1.22.0",
- org.eclipse.emf.ecp.spi.common.ui.composites;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.common.ui;version="1.23.0",
+ org.eclipse.emf.ecp.spi.common.ui.composites;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.common.ui
Import-Package: org.eclipse.emf.edit.ui.provider;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 ed9106e..19af277 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 30416a1..6b273e8 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Common
Bundle-SymbolicName: org.eclipse.emf.ecp.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.22.0",
- org.eclipse.emf.ecp.common.spi.asserts;version="1.22.0",
- org.eclipse.emf.ecp.common.spi.cachetree;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.23.0",
+ org.eclipse.emf.ecp.common.spi.asserts;version="1.23.0",
+ org.eclipse.emf.ecp.common.spi.cachetree;version="1.23.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.8
diff --git a/bundles/org.eclipse.emf.ecp.common/pom.xml b/bundles/org.eclipse.emf.ecp.common/pom.xml
index 3515a33..cbbdc01 100644
--- a/bundles/org.eclipse.emf.ecp.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/cachetree/AbstractCachedTree.java b/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/cachetree/AbstractCachedTree.java
index d02a4e0..c3d58f2 100644
--- a/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/cachetree/AbstractCachedTree.java
+++ b/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/cachetree/AbstractCachedTree.java
@@ -194,6 +194,9 @@
}
CachedTreeNode<T> node = nodes.get(eObject);
+ if (node == null) {
+ return;
+ }
final Object parentObject = node.getParent();
final CachedTreeNode<T> parentNode = parentObject == null ? null : nodes.get(parentObject);
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 2c00846..4a1a63a 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Emffilter
Bundle-SymbolicName: org.eclipse.emf.ecp.core.emffilter;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.emffilter.internal;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.core.emffilter
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 c0f3e1d..472215e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c26aab7..caffc61 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core RAP Sessionprovider
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/component.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.servlet.http;version="0.0.0",
- org.eclipse.emf.ecp.core.rap;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.23.0,1.24.0)",
org.eclipse.rap.rwt;version="0.0.0",
org.eclipse.rap.rwt.service;version="3.0.2"
Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt
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 c2ecb89..165aad7 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 e3fb877..9df2f13 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.core.rap;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.runtime;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 62e91b3..a003c3c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 825f075..23a5803 100644
--- a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core
Bundle-SymbolicName: org.eclipse.emf.ecp.core;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0",
- org.eclipse.emf.ecp.core.exceptions;version="1.22.0",
- org.eclipse.emf.ecp.core.util;version="1.22.0",
- org.eclipse.emf.ecp.core.util.observer;version="1.22.0",
- org.eclipse.emf.ecp.internal.core;version="1.22.0";
+Export-Package: org.eclipse.emf.ecp.core;version="1.23.0",
+ org.eclipse.emf.ecp.core.exceptions;version="1.23.0",
+ org.eclipse.emf.ecp.core.util;version="1.23.0",
+ org.eclipse.emf.ecp.core.util.observer;version="1.23.0",
+ org.eclipse.emf.ecp.internal.core;version="1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.core.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.ui",
- org.eclipse.emf.ecp.internal.core.util.observer;version="1.22.0";x-friends:="org.eclipse.emf.ecp.core.rap",
- org.eclipse.emf.ecp.spi.core;version="1.22.0",
- org.eclipse.emf.ecp.spi.core.util;version="1.22.0"
+ org.eclipse.emf.ecp.internal.core.properties;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.core.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.ui",
+ org.eclipse.emf.ecp.internal.core.util.observer;version="1.23.0";x-friends:="org.eclipse.emf.ecp.core.rap",
+ org.eclipse.emf.ecp.spi.core;version="1.23.0",
+ org.eclipse.emf.ecp.spi.core.util;version="1.23.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.22.0,1.23.0)"
-Import-Package: org.eclipse.emfforms.common;version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
+Import-Package: org.eclipse.emfforms.common;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.core
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 bc4d007..a3c3d08 100644
--- a/bundles/org.eclipse.emf.ecp.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/util/ExtensionParser.java b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/util/ExtensionParser.java
index e19c313..c89baaa 100644
--- a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/util/ExtensionParser.java
+++ b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/internal/core/util/ExtensionParser.java
@@ -75,6 +75,8 @@
case IExtensionDelta.REMOVED:
removeExtension(extension, remove);
break;
+ default:
+ break;
}
}
@@ -130,6 +132,7 @@
/**
* @author Eike Stepper
+ * @param <ELEMENT> The type of this descriptor which must extend {@link InternalRegistryElement}
*/
public static class ExtensionDescriptor<ELEMENT extends InternalRegistryElement>
extends ElementDescriptor<ELEMENT> {
diff --git a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/spi/core/util/InternalElementRegistry.java b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/spi/core/util/InternalElementRegistry.java
index 1fb6da2..e02670a 100644
--- a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/spi/core/util/InternalElementRegistry.java
+++ b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/spi/core/util/InternalElementRegistry.java
@@ -28,6 +28,7 @@
/**
* @author Eike Stepper
+ * @param <ELEMENT> The type of this listener, must extend an {@link ECPElement}
*/
public interface ResolveListener<ELEMENT extends ECPElement> {
void descriptorChanged(InternalDescriptor<ELEMENT> descriptor, boolean resolved) throws Exception;
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 196e654..c6afd84 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Diagnostician
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diagnostician;version="1.23.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.23.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.8
diff --git a/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml b/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
index 1e4d161..76e8c30 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 3af5974..81d3424 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Diff Merge Context
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.context
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.diffmerge.spi.context;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.context;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.diffmerge.spi.context;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.23.0,1.24.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.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.context
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
index d5eab33..c516e00 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0bb132e..0ba8f52 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model.provider;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 a1aef8d..6b4537a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1c54c33..84d82a6 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.22.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.23.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.model
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
index 2eac5b7..d65f623 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1f060ec..5c92200 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,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: DiffMerge Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.renderer.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.23.0,1.24.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 1951fd7..f68a02c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 e914e6c..05a9164 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: DiffMerge UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.swt
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.diffmerge.renderer.swt"
+Export-Package: org.eclipse.emf.ecp.diffmerge.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.jface.layout;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 f5d2e12..fa6c304 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 9a0890a..e537f1e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Doc
Bundle-SymbolicName: org.eclipse.emf.ecp.doc;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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 ec05ae4..7059f39 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 19c2341..ced0934 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECore GenModel Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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 @@
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.102.1,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ecore.editor.ui
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 59c5df7..0d53797 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0816c49..948b53b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP ECore Editor
Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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 8c8e5e3..18949d3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 cb77458..9a11c53 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
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Editor controls for Ecore Elements (Deprecated)
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.ecore.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.edit.ecore.swt
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 29931ff..3e92cc1 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 83a242f..0b45685 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.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.22.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.22.0";
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.23.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.23.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.23.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.22.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.22.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.22.0";
+ org.eclipse.emf.ecp.edit.internal.swt.reference;version="1.23.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.23.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.23.0";
x-friends:="org.eclipse.emf.ecp.editor,
org.eclipse.emf.ecp.explorereditorbridge,
org.eclipse.emf.ecp.ui.view.swt,
@@ -26,26 +26,27 @@
org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,
org.eclipse.emf.ecp.view.core.swt,
org.eclipse.emfforms.swt.control.multiattribute",
- org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.22.0",
- org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.22.0",
- org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.22.0",
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.22.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="1.22.0"
+ org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.23.0",
+ org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.23.0",
+ org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.23.0",
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.23.0",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 66ef636..1f7677b 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AttributeMultiControlTester.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AttributeMultiControlTester.java
index 19b12e6..4a3d7bd 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AttributeMultiControlTester.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/AttributeMultiControlTester.java
@@ -94,26 +94,24 @@
if (EAttribute.class.isInstance(feature)) {
final Class<?> instanceClass = ((EAttribute) feature).getEAttributeType().getInstanceClass();
- if (instanceClass != null) {
- if (instanceClass.isPrimitive()) {
- try {
- final Class<?> primitive = (Class<?>) tester.getSupportedClassType().getField("TYPE").get(null);//$NON-NLS-1$
- if (!primitive.equals(instanceClass)) {
- return NOT_APPLICABLE;
- }
-
- } catch (final IllegalArgumentException e) {
- return NOT_APPLICABLE;
- } catch (final SecurityException e) {
- return NOT_APPLICABLE;
- } catch (final IllegalAccessException e) {
- return NOT_APPLICABLE;
- } catch (final NoSuchFieldException e) {
+ if (instanceClass != null && instanceClass.isPrimitive()) {
+ try {
+ final Class<?> primitive = (Class<?>) tester.getSupportedClassType().getField("TYPE").get(null);//$NON-NLS-1$
+ if (!primitive.equals(instanceClass)) {
return NOT_APPLICABLE;
}
- } else if (!tester.getSupportedClassType().isAssignableFrom(instanceClass)) {
+
+ } catch (final IllegalArgumentException e) {
+ return NOT_APPLICABLE;
+ } catch (final SecurityException e) {
+ return NOT_APPLICABLE;
+ } catch (final IllegalAccessException e) {
+ return NOT_APPLICABLE;
+ } catch (final NoSuchFieldException e) {
return NOT_APPLICABLE;
}
+ } else if (instanceClass != null && !tester.getSupportedClassType().isAssignableFrom(instanceClass)) {
+ return NOT_APPLICABLE;
}
} else if (EReference.class.isInstance(feature)) {
return NOT_APPLICABLE;
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
index 544431e..709a211 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
@@ -188,28 +188,12 @@
boolean maxValue = false;
final Class<?> instanceClass = getInstanceClass();
String formatedValue = ""; //$NON-NLS-1$
- try {
- if (Integer.class.isAssignableFrom(instanceClass)
- || Integer.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
- if (Integer.MAX_VALUE == number.intValue()) {
- maxValue = true;
- formatedValue = format.format(Integer.MAX_VALUE);
- }
- } else if (Long.class.isAssignableFrom(instanceClass)
- || Long.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
- if (Long.MAX_VALUE == number.longValue()) {
- maxValue = true;
- formatedValue = format.format(Long.MAX_VALUE);
- }
- }
- } catch (final IllegalArgumentException ex) {
- Activator.logException(ex);
- } catch (final SecurityException ex) {
- Activator.logException(ex);
- } catch (final IllegalAccessException ex) {
- Activator.logException(ex);
- } catch (final NoSuchFieldException ex) {
- Activator.logException(ex);
+ if (isOfClass(Integer.class, instanceClass) && Integer.MAX_VALUE == number.intValue()) {
+ maxValue = true;
+ formatedValue = format.format(Integer.MAX_VALUE);
+ } else if (isOfClass(Long.class, instanceClass) && Long.MAX_VALUE == number.longValue()) {
+ maxValue = true;
+ formatedValue = format.format(Long.MAX_VALUE);
}
if (maxValue) {
@@ -238,6 +222,16 @@
}
}
+ private <T extends Number> boolean isOfClass(Class<T> clazz, Class<?> toCheck) {
+ try {
+ return clazz.isAssignableFrom(toCheck)
+ || clazz.getField("TYPE").get(null).equals(toCheck); //$NON-NLS-1$
+ } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException ex) {
+ Activator.logException(ex);
+ return false;
+ }
+ }
+
private Object revertToOldValue(final Object value) {
if (getFirstStructuralFeature().getDefaultValue() == null && (value == null || value.equals(""))) { //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/ReferenceMultiControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/ReferenceMultiControl.java
index b8d493f..628b4ef 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/ReferenceMultiControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/reference/ReferenceMultiControl.java
@@ -15,7 +15,6 @@
package org.eclipse.emf.ecp.edit.internal.swt.reference;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecp.edit.internal.swt.Activator;
import org.eclipse.emf.ecp.edit.internal.swt.controls.MultiControl;
import org.eclipse.emf.ecp.edit.spi.ReferenceService;
import org.eclipse.emf.ecp.edit.spi.swt.actions.ECPSWTAction;
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 4880d75..dfddaf3 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
@@ -82,28 +82,12 @@
boolean maxValue = false;
final Class<?> instanceClass = getInstanceClass();
String formatedValue = ""; //$NON-NLS-1$
- try {
- if (Integer.class.isAssignableFrom(instanceClass)
- || Integer.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
- if (Integer.MAX_VALUE == number.intValue()) {
- maxValue = true;
- formatedValue = format.format(Integer.MAX_VALUE);
- }
- } else if (Long.class.isAssignableFrom(instanceClass)
- || Long.class.getField("TYPE").get(null).equals(instanceClass)) { //$NON-NLS-1$
- if (Long.MAX_VALUE == number.longValue()) {
- maxValue = true;
- formatedValue = format.format(Long.MAX_VALUE);
- }
- }
- } catch (final IllegalArgumentException ex) {
- Activator.logException(ex);
- } catch (final SecurityException ex) {
- Activator.logException(ex);
- } catch (final IllegalAccessException ex) {
- Activator.logException(ex);
- } catch (final NoSuchFieldException ex) {
- Activator.logException(ex);
+ if (isOfClass(Integer.class, instanceClass) && Integer.MAX_VALUE == number.intValue()) {
+ maxValue = true;
+ formatedValue = format.format(Integer.MAX_VALUE);
+ } else if (isOfClass(Long.class, instanceClass) && Long.MAX_VALUE == number.longValue()) {
+ maxValue = true;
+ formatedValue = format.format(Long.MAX_VALUE);
}
if (maxValue) {
@@ -132,6 +116,16 @@
}
}
+ private <T extends Number> boolean isOfClass(Class<T> clazz, Class<?> toCheck) {
+ try {
+ return clazz.isAssignableFrom(toCheck)
+ || clazz.getField("TYPE").get(null).equals(toCheck); //$NON-NLS-1$
+ } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException ex) {
+ Activator.logException(ex);
+ return false;
+ }
+ }
+
private Object revertToOldValue(final Object value) {
if (eStructuralFeature.getDefaultValue() == null && (value == null || value.equals(""))) { //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java
index 65fb41f..9285755 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java
@@ -24,12 +24,12 @@
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.ecp.edit.internal.swt.Activator;
import org.eclipse.emf.ecp.edit.spi.ECPAbstractControl;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
import org.eclipse.emf.ecp.view.spi.renderer.RenderingResultRow;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/util/SWTValidationHelper.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/util/SWTValidationHelper.java
index cbed7f9..424643c 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/util/SWTValidationHelper.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/util/SWTValidationHelper.java
@@ -38,8 +38,10 @@
*
* @author jfaltermeier
* @since 1.5
- *
+ * @deprecated use org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper or
+ * org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService instead
*/
+@Deprecated
public class SWTValidationHelper {
/**
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 c466152..2a9e5057 100644
--- a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emf.ecp.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0",
- org.eclipse.emf.ecp.edit.spi.util;version="1.22.0",
- org.eclipse.emf.ecp.internal.edit;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.spi;version="1.23.0",
+ org.eclipse.emf.ecp.edit.spi.util;version="1.23.0",
+ org.eclipse.emf.ecp.internal.edit;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
-Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
+Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="1.2.0"
Automatic-Module-Name: org.eclipse.emf.ecp.edit
Service-Component: OSGI-INF/ecpControlFactory.xml,OSGI-INF/org.eclipse.emf.ecp.internal.edit.DeleteServiceFactoryImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.edit/pom.xml b/bundles/org.eclipse.emf.ecp.edit/pom.xml
index 6df46e4..7437372 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/ConditionalDeleteService.java b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/ConditionalDeleteService.java
new file mode 100644
index 0000000..b65f506
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/ConditionalDeleteService.java
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Christian W. Damus and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christian W. Damus - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.spi;
+
+import java.util.Collections;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emfforms.spi.core.services.view.EMFFormsViewContext;
+
+/**
+ * An extension of the {@link DeleteService} protocol that supports conditional deletion,
+ * respecting a model's edit providers when they provide unexecutable commands to veto
+ * deletion. Implementations of this interface <strong>should be registered</strong> as
+ * OSGi services providing {@code DeleteService} because the framework looks for that
+ * service interface but will test whether the implementation also provides this extension.
+ * Whether the extension interface is also declared to OSGi is left to the provider's discretion.
+ *
+ * @since 1.23
+ */
+public interface ConditionalDeleteService extends DeleteService {
+
+ /**
+ * Queries whether an {@code object} can be deleted. By convention a {@code null} value
+ * cannot be deleted.
+ *
+ * @param object an object to be deleted
+ * @return {@code false} if the {@code object} cannot be deleted or is {@code null}; {@code true}, otherwise
+ */
+ default boolean canDelete(Object object) {
+ return canDelete(Collections.singleton(object));
+ }
+
+ /**
+ * Queries whether <em>all</em> of the given {@code objects} can be deleted.
+ *
+ * @param objects a number of objects to be deleted
+ * @return {@code false} if any of the objects cannot be deleted; {@code true} otherwise, including the case of no
+ * {@code objects}
+ */
+ boolean canDelete(Iterable<?> objects);
+
+ /**
+ * Obtain a conditional delete service for a given {@code context}, if necessary
+ * {@linkplain #adapt(DeleteService) adapting} its service implementation.
+ *
+ * @param context a form context
+ * @return the delete service, or an adapter if the actual delete service implementation does not provide
+ * the {@link ConditionalDeleteService} protocol or if there isn't a delete service at all (in which case nothing can
+ * be deleted)
+ *
+ * @see #adapt(DeleteService)
+ */
+ static ConditionalDeleteService getDeleteService(EMFFormsViewContext context) {
+ return adapt(context == null ? null : context.getService(DeleteService.class));
+ }
+
+ /**
+ * Obtain a view of a given {@code service} as conditional delete service, if necessary adapting a service
+ * implementation that does not provide the {@link ConditionalDeleteService} protocol with a default deletion condition.
+ * In that case, an object is assumed to be deletable if it is not {@code null} and it is an
+ * {@link EObject} that has some container from which it can be removed (root elements not logically
+ * being deletable).
+ *
+ * @param service a delete service
+ * @return the delete service, or an adapter if the actual delete service implementation does not provide
+ * the {@link ConditionalDeleteService} protocol or if the original {@code service} is {@code null}
+ */
+ static ConditionalDeleteService adapt(DeleteService service) {
+ return service == null
+ ? DeleteServiceAdapter.NULL
+ : service instanceof ConditionalDeleteService
+ ? (ConditionalDeleteService) service
+ : new DeleteServiceAdapter(service);
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/DeleteService.java b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/DeleteService.java
index d14140b..e222309 100644
--- a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/DeleteService.java
+++ b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/DeleteService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Johannes Faltermeier - initial API and implementation
+ * Christian W. Damus - bug 552385
******************************************************************************/
package org.eclipse.emf.ecp.edit.spi;
@@ -18,7 +19,15 @@
import org.eclipse.emf.ecp.view.spi.context.ViewModelService;
/**
+ * <p>
* The DeleteService is used by renderers in order to delete objects from the containment tree.
+ * </p>
+ * <p>
+ * <strong>Note</strong> that since the 1.23 release, it is recommended to implement the
+ * {@link ConditionalDeleteService} interface to support conditional deletion, honouring the model's
+ * edit providers when they veto deletion by providing unexecutable commands.
+ * </p>
+ *
*
* @author jfaltermeier
* @since 1.6
diff --git a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/DeleteServiceAdapter.java b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/DeleteServiceAdapter.java
new file mode 100644
index 0000000..45f31f9
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/DeleteServiceAdapter.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Christian W. Damus and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christian W. Damus - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.spi;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+
+/**
+ * An adapter for delete services that do not implement the {@link ConditionalDeleteService} protocol.
+ */
+final class DeleteServiceAdapter implements ConditionalDeleteService {
+
+ /** An adapter for the {@code null} service (when there is no delete service at all). */
+ static final ConditionalDeleteService NULL = new DeleteServiceAdapter(null);
+
+ private final DeleteService delegate;
+
+ /**
+ * Initializes me with the real delete service.
+ *
+ * @param delegate the real delete service
+ */
+ DeleteServiceAdapter(DeleteService delegate) {
+ super();
+
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void deleteElements(Collection<Object> toDelete) {
+ if (delegate != null) {
+ delegate.deleteElements(toDelete);
+ } else {
+ throw new IllegalStateException("No deletion service available."); //$NON-NLS-1$
+ }
+ }
+
+ @Override
+ public void deleteElement(Object toDelete) {
+ if (delegate != null) {
+ delegate.deleteElement(toDelete);
+ } else {
+ throw new IllegalStateException("No deletion service available."); //$NON-NLS-1$
+ }
+ }
+
+ @Override
+ public void instantiate(ViewModelContext context) {
+ if (delegate != null) {
+ delegate.instantiate(context);
+ }
+ }
+
+ @Override
+ public void dispose() {
+ if (delegate != null) {
+ delegate.dispose();
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return delegate == null ? Integer.MIN_VALUE : delegate.getPriority();
+ }
+
+ @Override
+ public boolean canDelete(Iterable<?> objects) {
+ // Cannot delete if we have no service to effect the deletion
+ boolean result = delegate != null;
+
+ if (result) {
+ for (final Object next : objects) {
+ // Cannot delete a null or a root object
+ if (next == null || next instanceof EObject && ((EObject) next).eContainer() == null) {
+ result = false;
+ break;
+ }
+ }
+ }
+
+ return result;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/EMFDeleteServiceImpl.java b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/EMFDeleteServiceImpl.java
index 98a844f..dad5963 100644
--- a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/EMFDeleteServiceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/EMFDeleteServiceImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,11 +10,14 @@
*
* Contributors:
* Johannes Faltermeier - initial API and implementation
+ * Christian W. Damus - bug 552385
******************************************************************************/
package org.eclipse.emf.ecp.edit.spi;
import java.util.Collection;
import java.util.Collections;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.ecore.EObject;
@@ -33,47 +36,26 @@
* @since 1.6
*
*/
-public class EMFDeleteServiceImpl implements DeleteService {
+public class EMFDeleteServiceImpl implements ConditionalDeleteService {
private EditingDomain editingDomain;
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.view.spi.context.ViewModelService#instantiate(org.eclipse.emf.ecp.view.spi.context.ViewModelContext)
- */
@Override
public void instantiate(ViewModelContext context) {
editingDomain = AdapterFactoryEditingDomain
.getEditingDomainFor(context.getDomainModel());
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.view.spi.context.ViewModelService#dispose()
- */
@Override
public void dispose() {
// no op
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.view.spi.context.ViewModelService#getPriority()
- */
@Override
public int getPriority() {
return 1;
}
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.edit.spi.DeleteService#deleteElements(java.util.Collection)
- */
@Override
public void deleteElements(final Collection<Object> toDelete) {
if (toDelete == null || toDelete.isEmpty()) {
@@ -127,12 +109,6 @@
}
}
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.edit.spi.DeleteService#deleteElement(java.lang.Object)
- */
@Override
public void deleteElement(Object toDelete) {
if (toDelete == null) {
@@ -142,4 +118,34 @@
deleteElements(Collections.singleton(toDelete));
}
+ @Override
+ public boolean canDelete(Iterable<?> objects) {
+ boolean result;
+
+ if (editingDomain != null) {
+ Collection<?> collection;
+ if (objects instanceof Collection<?>) {
+ collection = (Collection<?>) objects;
+ } else {
+ collection = StreamSupport.stream(objects.spliterator(), false).collect(Collectors.toList());
+ }
+
+ final Command deleteCommand = DeleteCommand.create(editingDomain, collection);
+ result = deleteCommand.canExecute();
+ } else {
+ // Just see whether any object is a root
+ result = true;
+
+ for (final Object next : objects) {
+ if (next instanceof EObject && ((EObject) next).eContainer() == null) {
+ // Cannot delete a root object
+ result = false;
+ break;
+ }
+ }
+ }
+
+ return result;
+ }
+
}
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 006d813..7971523 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,24 +2,24 @@
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.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.editor.internal.e3;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.editor.e3;version="1.23.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.editor.internal.e3;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
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.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 1f4b3c2..4fc5000 100644
--- a/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 1f712d9..5343f7a 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
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF To Web JSON
Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.json
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.22.0",
- org.eclipse.emf.ecp.emf2web.json.generator.seed.xtend;version="1.22.0",
- org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.22.0",
- org.eclipse.emf.ecp.emf2web.json.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.23.0",
+ org.eclipse.emf.ecp.emf2web.json.generator.seed.xtend;version="1.23.0",
+ org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.23.0",
+ org.eclipse.emf.ecp.emf2web.json.util;version="1.23.0";x-internal:=true
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.json
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 ec101bd..0276016 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.emf2web.json</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 2e6d3c8..b49995e 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
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF To Web JSON UI
Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.ui.json;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.emf2web.ui.json.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web.ui.json;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.ui.json.internal.handler;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.ui.json.internal.messages;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emf2web.ui.json;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.ui.json.internal.handler;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.ui.json.internal.messages;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emf2web.ui;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.emf2web;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.ui.json
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 3a24d0e..a04d026 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.emf2web.ui.json</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 6c7cac8..e98cf8c 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
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF To Web UI
Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web.ui.handler;version="1.22.0",
- org.eclipse.emf.ecp.emf2web.ui.messages;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.ui.wizard;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.emf2web.ui.handler;version="1.23.0",
+ org.eclipse.emf.ecp.emf2web.ui.messages;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.ui.wizard;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.23.0,1.24.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 @@
org.eclipse.equinox.common;bundle-version="[3.7.0,4.0.0)",
com.ibm.icu;bundle-version="54.1.0",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.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 fa0e4a5..9a87101 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.emf2web.ui</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 fedf231..625b263 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF To Web
Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.emf2web.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emf2web;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.controller.xtend;version="1.22.0";
+Export-Package: org.eclipse.emf.ecp.emf2web;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.controller.xtend;version="1.23.0";
uses:="org.eclipse.emf.ecore,
org.eclipse.emf.ecp.emf2web.exporter,
org.eclipse.emf.common.util,
org.eclipse.emf.ecp.view.spi.model",
- org.eclipse.emf.ecp.emf2web.exporter;version="1.22.0";uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecp.emf2web.controller.xtend",
- org.eclipse.emf.ecp.emf2web.generator;version="1.22.0";uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.ecp.emf2web.internal.messages;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emf2web.util;version="1.22.0";uses:="org.eclipse.emf.ecore",
- org.eclipse.emf.ecp.emf2web.util.xtend;version="1.22.0"
+ org.eclipse.emf.ecp.emf2web.exporter;version="1.23.0";uses:="org.eclipse.emf.common.util,org.eclipse.emf.ecp.emf2web.controller.xtend",
+ org.eclipse.emf.ecp.emf2web.generator;version="1.23.0";uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.ecp.emf2web.internal.messages;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emf2web.util;version="1.23.0";uses:="org.eclipse.emf.ecore",
+ org.eclipse.emf.ecp.emf2web.util.xtend;version="1.23.0"
Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
@@ -25,26 +25,26 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.23.0,1.24.0)",
com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.common.model;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
index 6dfd189..c1dd424 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.emf2web</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 7608493..d2fa82e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore Core RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core.rap
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.core.rap;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.rap.rwt;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 4a27531..ed4b574 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 d21ebb6..1cc3f54 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore Provider Core Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";
+Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.23.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,10 +13,10 @@
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.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)"
-Import-Package: org.eclipse.emfforms.common;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.common;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.emfstore.core
Service-Component: OSGI-INF/esWorkspaceProviderProvider.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
index 79f4c10..0632ae0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f7451ea..330686d 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore E3
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.e3;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.22.0";x-internal:=true;uses:="org.eclipse.core.commands"
-Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui.decorator;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.23.0";x-internal:=true;uses:="org.eclipse.core.commands"
+Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml
index c23becd..272576a 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/plugin.xml
@@ -348,22 +348,25 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="and">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="and">
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
+ value="true">
+ </test>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
+ value="true">
+ </test>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -373,18 +376,21 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="and">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
- value="false">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="and">
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.elementShared"
+ value="false">
+ </test>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -419,18 +425,28 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ </and>
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
+ value="true">
+ </test>
+ </and>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -440,18 +456,28 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ </and>
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isDirty"
+ value="true">
+ </test>
+ </and>
+ </iterate>
</with>
</enabledWhen>
</handler>
@@ -549,18 +575,23 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.repository.providerName"
- value="org.eclipse.emf.ecp.emfstore.provider">
- </test>
- <test
- property="org.eclipse.emf.ecp.emfstore.ui.testers.isLocalAndNotRunning"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPRepository">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.repository.providerName"
+ value="org.eclipse.emf.ecp.emfstore.provider">
+ </test>
+ </and>
+ <test
+ property="org.eclipse.emf.ecp.emfstore.ui.testers.isLocalAndNotRunning"
+ value="true">
+ </test>
+ </iterate>
</with>
</enabledWhen>
</handler>
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 34182ba..de0611b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2c70a4d..2ff05f9 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: Emfstore e4 ui
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.e4;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.e4.core.di;bundle-version="[1.3.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.emfstore.ui.e4
Import-Package: org.osgi.framework;version="1.3.0"
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 2818798..31ccb1d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b18813f..a0d0515 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Search UI
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.search;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.e3;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.emfstore.ui.search
Import-Package: org.eclipse.core.commands;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 7a31962..5050dad 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 362a16a..3d25930 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore UI Provider
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.22.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.23.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.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.commands;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 7318add..64aa0c6 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 fa7b85c..52c1b09 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,11 +2,11 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.examplemodel.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml b/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
index 9c6bebb..72ebbd5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8f8e680..55ebbcc 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Explorer Editor Bridge
Bundle-SymbolicName: org.eclipse.emf.ecp.explorereditorbridge;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.ui.view.test"
+Export-Package: org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.editor.e3;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.editor.e3;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.internal.swt;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.internal.swt;version="[1.23.0,1.24.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 f783420..dc58a56 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 10e4218..c116078 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,8 +15,8 @@
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,1.8.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.graphiti.integration
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 342d129..64a5ded 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,15 +2,15 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.view.templatebridge
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 cd2f218..8c1d3ff 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0a48667..865b43e 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,31 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: IDE View Editor
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
- org.eclipse.emf.ecp.ide.editor.view.messages;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
+ org.eclipse.emf.ecp.ide.editor.view.messages;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.ui.ide;bundle-version="[3.9.1,4.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.editor;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.editor;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.view
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 c892ef0..60b3c89 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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/ViewEditorActionBarContributor.java b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorActionBarContributor.java
index 5918aa6..780a383 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorActionBarContributor.java
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorActionBarContributor.java
@@ -14,10 +14,9 @@
package org.eclipse.emf.ecp.ide.editor.view;
import java.util.Collection;
-import java.util.stream.Stream;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecp.edit.spi.DeleteService;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.edit.ui.action.DeleteAction;
import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
@@ -92,16 +91,9 @@
@Override
public boolean updateSelection(IStructuredSelection selection) {
- final DeleteService deleteService = getService(DeleteService.class);
- if (deleteService == null) {
- return super.updateSelection(selection);
- }
+ final ConditionalDeleteService deleteService = ConditionalDeleteService.getDeleteService(getViewModelContext());
- return !selection.isEmpty() && Stream.of(selection.toArray()).noneMatch(this::isRoot);
- }
-
- private boolean isRoot(Object object) {
- return object instanceof EObject && ((EObject) object).eContainer() == null;
+ return !selection.isEmpty() && deleteService.canDelete(selection.toList());
}
}
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 9b0933e..19f72b7 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,8 +2,8 @@
Bundle-ManifestVersion: 2
Bundle-Name: Viewmodel
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.viewmodel;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.viewmodel
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 27f2d7c..a97f153 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF
index 3ecef2a..6e6225c 100644
--- a/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.migration/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewModel Migration Tooling
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.migration;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.ide.internal.migration.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.internal.migration;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.internal.migration;version="1.23.0";x-internal:=true
Require-Bundle: 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.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;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ide.migration
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml b/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml
index 543e720..bf2b357 100644
--- a/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ide.migration/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.migration</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 aa721a6..8b3d008 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Ecore Helper Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.ide.internal.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.internal;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ide.spi.util;version="1.22.0",
- org.eclipse.emf.ecp.internal.ide.util.messages;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.internal;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ide.spi.util;version="1.23.0",
+ org.eclipse.emf.ecp.internal.ide.util.messages;version="1.23.0";x-internal:=true
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ide.util
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/pom.xml b/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
index 1f5e445..280e459 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 8141546..b057cf2 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: IDE ViewModel Service
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ide.view.service;version="1.22.0";
+Export-Package: org.eclipse.emf.ecp.ide.view.internal.service;version="1.23.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ide.view.service;version="1.23.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.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 00a8017..ca0647b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 598f028..081ebb0 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Quickfix UI
Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.ui.e4;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.22.0";x-friends:="org.eclipse.emf.ecp.application.e4"
+Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.quickfix;bundle-version="[1.23.0,1.24.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 596ee79..da34e8a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8a3f83a..5b1cc0f 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Quickfix Service
Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix;version="1.22.0",
- org.eclipse.emf.ecp.quickfix.internal;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.quickfix;version="1.23.0",
+ org.eclipse.emf.ecp.quickfix.internal;version="1.23.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.8
diff --git a/bundles/org.eclipse.emf.ecp.quickfix/pom.xml b/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
index d3b6927..ed683ed 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 58fac8a..5ce484a 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: RAP Util
Bundle-SymbolicName: org.eclipse.emf.ecp.rap.util;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.rap.util
Import-Package: org.eclipse.jface.dialogs;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 ae5397c..5fee02d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 925b0c0..782a343 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.rap;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.rap.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.rap;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.rap.ui;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.rap/pom.xml b/bundles/org.eclipse.emf.ecp.rap/pom.xml
index 846bf0b..b6aef09 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 7c6c416..9cf616e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Test Helpers
Bundle-SymbolicName: org.eclipse.emf.ecp.test.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.test.common;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.test.common;version="1.23.0"
Require-Bundle: org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.test.common/pom.xml b/bundles/org.eclipse.emf.ecp.test.common/pom.xml
index b13a4d9..0132078 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8c8d819..9881d4b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Eclipse 3.x Integration
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e3;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.commands;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e3;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.linkedView;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.perspective;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.platform;version="1.22.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
- org.eclipse.emf.ecp.ui.tester;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.views;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.actions;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.commands;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e3;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.linkedView;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.perspective;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.platform;version="1.23.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.ecp.ui.tester;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.views;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.ui.e3
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml b/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
index dc435a0..7113518 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
@@ -558,9 +558,9 @@
<iterate
ifEmpty="false"
operator="and">
- <instanceof
- value="org.eclipse.emf.ecp.core.ECPProject">
- </instanceof>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
<test
property="org.eclipse.emf.ecp.core.project.open"
value="true">
@@ -638,6 +638,9 @@
<iterate
ifEmpty="false"
operator="and">
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
<test
property="org.eclipse.emf.ecp.core.project.open"
value="true">
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
index e5678b0..33fe181 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 ec42284..2ec2e88 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,34 +2,34 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP E4 UI
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e4;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.handlers;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e4.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.view;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.internal.e4;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.e4.editor;version="1.23.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.handlers;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e4.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.view;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.internal.e4;version="1.23.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,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
org.eclipse.e4.core.services;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: javax.annotation;version="1.1.0",
javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
org.osgi.service.event;version="1.3.0"
Automatic-Module-Name: org.eclipse.emf.ecp.ui.e4
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
index 63fb749..5b82308 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/.project b/bundles/org.eclipse.emf.ecp.ui.rap/.project
index aa49f3b..494e030 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rap/.project
+++ b/bundles/org.eclipse.emf.ecp.ui.rap/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 133d9da..f0004fd 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP UI RWT
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.rap
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
index 2284c9b..ca6337f 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/.project b/bundles/org.eclipse.emf.ecp.ui.rcp/.project
index cd3b979..856d275 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rcp/.project
+++ b/bundles/org.eclipse.emf.ecp.ui.rcp/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 438fd71..a725b98 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.rcp
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
index e818b88..e6f6b72 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 347959c..9623f9b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Transactional UI
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.transaction;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.transaction
Import-Package: org.eclipse.core.commands;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 4de605c..2a332c4 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8903da8..6e99753 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP UI Validation E4
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.e4;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.validation.e4.view;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.validation.e4.view;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.23.0,1.24.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,3.0.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 4628c41..9060840 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation.e4/src/org/eclipse/emf/ecp/ui/validation/e4/view/DiagnosticView.java b/bundles/org.eclipse.emf.ecp.ui.validation.e4/src/org/eclipse/emf/ecp/ui/validation/e4/view/DiagnosticView.java
index 1a6487c..49b17a6 100644
--- a/bundles/org.eclipse.emf.ecp.ui.validation.e4/src/org/eclipse/emf/ecp/ui/validation/e4/view/DiagnosticView.java
+++ b/bundles/org.eclipse.emf.ecp.ui.validation.e4/src/org/eclipse/emf/ecp/ui/validation/e4/view/DiagnosticView.java
@@ -10,10 +10,12 @@
*
* Contributors:
* Johannes Faltermeier - initial API and implementation
- * Christian W. Damus - bug 546899
+ * Christian W. Damus - bugs 546899, 550971
******************************************************************************/
package org.eclipse.emf.ecp.ui.validation.e4.view;
+import java.util.function.Consumer;
+
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
@@ -21,6 +23,7 @@
import org.eclipse.e4.ui.di.Focus;
import org.eclipse.e4.ui.services.EMenuService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
+import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecp.internal.ui.validation.ValidationTreeViewerFactory;
import org.eclipse.emf.ecp.ui.validation.ECPValidationResultService;
import org.eclipse.emf.ecp.ui.validation.ECPValidationResultService.ECPValidationResultServiceListener;
@@ -50,6 +53,8 @@
private ECPValidationResultServiceListener listener;
private TreeViewer diagnosticTree;
+ private Consumer<Object> diagnosticHandler = this::onDiagnostic;
+
/**
* Creates the diagnostic view.
*
@@ -85,18 +90,14 @@
}
}
});
- listener = new ECPValidationResultServiceListener() {
- @Override
- public void resultChanged(Object diagnostic) {
- diagnosticTree.setInput(diagnostic);
- diagnosticTree.expandAll();
- }
- };
+
+ // Don't just use the diagnostic handler as is because it can be replaced
+ listener = diagnostic -> diagnosticHandler.accept(diagnostic);
service.register(listener);
}
/**
- * Return the Tree showing the diagnostic data..
+ * Return the tree viewer showing the diagnostic data.
*
* @return The {@link TreeViewer} which contains the actual data
*/
@@ -134,4 +135,41 @@
service.deregister(listener);
}
+ /**
+ * Set a handler to receive new diagnostics from {@linkplain ECPValidationResultService validation result service}.
+ * The handler is invoked with either a {@link Diagnostic} or a collection or array of diagnostics, hence the
+ * {@link Object} signature.
+ *
+ * @param diagnosticHandler the new diagnostic handler, or {@code null} to install the
+ * {@linkplain #onDiagnostic(Object) default behaviour}
+ *
+ * @since 1.23
+ *
+ * @see #onDiagnostic(Object)
+ */
+ public void setOnDiagnostic(Consumer<Object> diagnosticHandler) {
+ if (diagnosticHandler != null) {
+ this.diagnosticHandler = diagnosticHandler;
+ } else {
+ this.diagnosticHandler = this::onDiagnostic;
+ }
+ }
+
+ /**
+ * The default strategy for handling a new {@code diagnostic} to present
+ * in the tree. This performs two actions:
+ * <ol>
+ * <li>set the {@code diagnostic} into the {@linkplain #getDiagnosticTree() tree} as its input</li>
+ * <li>expand all in the tree</li>
+ * </ol>
+ *
+ * @param diagnostic the new diagnostic
+ *
+ * @since 1.23
+ */
+ protected final void onDiagnostic(Object diagnostic) {
+ diagnosticTree.setInput(diagnostic);
+ diagnosticTree.expandAll();
+ }
+
}
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 01181a0..9cd657e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation View
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ide.migration",
- org.eclipse.emf.ecp.ui.validation;version="1.22.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
+Export-Package: org.eclipse.emf.ecp.internal.ui.validation;version="1.23.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ide.migration",
+ org.eclipse.emf.ecp.ui.validation;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
org.eclipse.e4.core.di.annotations;version="[1.3.0,2.0.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml b/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
index a00a98b..a4c5120 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF
index 7ebf3e1..d7c980b 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Legacy View Model Editor Controls
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.legacy;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy.handler;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.internal.editor.controls.legacy.handler;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.legacy
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml
index 5163af4..22ab2c0 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls.legacy/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
index 551e2cd..8570f64 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,55 +2,55 @@
Bundle-ManifestVersion: 2
Bundle-Name: Controls
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emfforms.ide.view.mappingsegment,org.eclipse.emf.ecp.view.template.tooling",
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.22.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.editor.controls;version="1.23.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emfforms.ide.view.mappingsegment,org.eclipse.emf.ecp.view.template.tooling",
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.23.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.emfforms.ide.view.multisegment,
org.eclipse.emf.ecp.view.template.tooling",
- org.eclipse.emf.ecp.view.spi.editor.controls;version="1.22.0"
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.resources;version="0.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.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/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/pom.xml
index 8744e6d..0c26fbf 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 5202178..e83a05b 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,10 +2,10 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.linewrapper
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 2dedeb9..21d57a3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2cd4e69..2e11ebe 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,30 +2,30 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dependency Injection SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.di;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.swt.di
-Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.locale;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 3c8a8c0..01b2987 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 bc90c4b..010c555 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,41 +2,41 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0",
- org.eclipse.emf.ecp.ui.view.swt.reference;version="1.22.0",
- org.eclipse.emf.ecp.view.internal.swt;version="1.22.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.22.0",
- org.eclipse.emf.ecp.view.spi.swt.layout;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.swt.masterdetail;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.swt.selection;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.swt.services;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt;version="1.23.0",
+ org.eclipse.emf.ecp.ui.view.swt.reference;version="1.23.0",
+ org.eclipse.emf.ecp.view.internal.swt;version="1.23.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.23.0",
+ org.eclipse.emf.ecp.view.spi.swt.layout;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.swt.masterdetail;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.swt.selection;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.swt.services;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.spi.view.template.service;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.label.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.emfforms.spi.view.annotation.model;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.spi.view.template.service;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.label.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.emfforms.spi.view.annotation.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.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 c7d9f26..738c10c 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/ui/view/swt/reference/EditNewObjectDialog.java b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/ui/view/swt/reference/EditNewObjectDialog.java
index 0478638..80c5373 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/ui/view/swt/reference/EditNewObjectDialog.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/ui/view/swt/reference/EditNewObjectDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2018 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -9,7 +9,7 @@
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
- * Eugen - initial API and implementation
+ * Eugen Nuefeld - initial API and implementation, bug 551103
* Christian W. Damus - bug 529542
******************************************************************************/
package org.eclipse.emf.ecp.ui.view.swt.reference;
@@ -22,6 +22,7 @@
import org.eclipse.emf.ecp.view.spi.context.ViewModelContextFactory;
import org.eclipse.emf.ecp.view.spi.provider.ViewProviderHelper;
import org.eclipse.emf.ecp.view.spi.swt.reporting.RenderingFailedReport;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
@@ -60,11 +61,6 @@
return true;
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
@Override
protected Control createDialogArea(Composite parent) {
final Composite composite = (Composite) super.createDialogArea(parent);
@@ -85,6 +81,10 @@
// which usually is the default
final ViewModelContext vmc = ViewModelContextFactory.INSTANCE.createViewModelContext(
ViewProviderHelper.getView(eObject, null), eObject);
+
+ if (AdapterFactoryEditingDomain.getEditingDomainFor(eObject).isReadOnly(eObject.eResource())) {
+ vmc.getViewModel().setReadonly(true);
+ }
try {
ECPSWTViewRenderer.INSTANCE.render(content, vmc);
} catch (final ECPRendererException ex) {
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 eb4f1b0..82b612f 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: MPI UI View
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0",
- org.eclipse.emf.ecp.view.internal.provider;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.internal.ui;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
- org.eclipse.emf.ecp.view.spi.provider;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.renderer;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.ui.view;version="1.23.0",
+ org.eclipse.emf.ecp.view.internal.provider;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.internal.ui;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.spi.provider;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.renderer;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view
Service-Component: OSGI-INF/EMFFormsViewService.xml
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
index 97cd661..657c768 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 4c0e06a..c7ec428 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP UI
Bundle-SymbolicName: org.eclipse.emf.ecp.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";
+Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.dialogs;version="1.22.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.internal.ui.model;version="1.22.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.22.0",
- org.eclipse.emf.ecp.internal.ui.util;version="1.22.0";
+ org.eclipse.emf.ecp.internal.ui.composites;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.ui.dialogs;version="1.23.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.internal.ui.model;version="1.23.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.23.0",
+ org.eclipse.emf.ecp.internal.ui.util;version="1.23.0";
x-friends:="org.eclipse.emf.ecp.explorereditorbridge,
org.eclipse.emf.ecp.ui.e3,
org.eclipse.emf.ecp.ui.e4,
@@ -22,17 +22,17 @@
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.22.0";
+ org.eclipse.emf.ecp.internal.wizards;version="1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.spi.ui;version="1.22.0",
- org.eclipse.emf.ecp.spi.ui.util;version="1.22.0",
- org.eclipse.emf.ecp.ui;version="1.22.0",
- org.eclipse.emf.ecp.ui.common;version="1.22.0";
+ org.eclipse.emf.ecp.internal.wizards.page;version="1.23.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.spi.ui;version="1.23.0",
+ org.eclipse.emf.ecp.spi.ui.util;version="1.23.0",
+ org.eclipse.emf.ecp.ui;version="1.23.0",
+ org.eclipse.emf.ecp.ui.common;version="1.23.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 @@
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.22.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ui.util;version="1.22.0"
+ org.eclipse.emf.ecp.ui.common.dnd;version="1.23.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ui.util;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.commands;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 3e49ef4..d7cb954 100644
--- a/bundles/org.eclipse.emf.ecp.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/PropertiesLabelProvider.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/PropertiesLabelProvider.java
index 76b0fe4..42a8da2 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/PropertiesLabelProvider.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/model/PropertiesLabelProvider.java
@@ -21,15 +21,19 @@
import org.eclipse.swt.graphics.Image;
/**
+ * A {@link LabelProvider} for properties.
+ *
* @author Eike Stepper
*/
public class PropertiesLabelProvider extends LabelProvider implements ITableLabelProvider {
private static final Image PROPERTY = Activator.getImage("icons/property_obj.gif"); //$NON-NLS-1$
+ /**
+ * Default constructor.
+ */
public PropertiesLabelProvider() {
}
- /** {@inheritDoc} */
@Override
public String getColumnText(Object element, int columnIndex) {
if (element instanceof Map.Entry) {
@@ -41,19 +45,22 @@
case 1:
return entry.getValue();
+ default:
+ return null;
}
}
return null;
}
- /** {@inheritDoc} */
@Override
public Image getColumnImage(Object element, int columnIndex) {
if (element instanceof Map.Entry) {
switch (columnIndex) {
case 0:
return PROPERTY;
+ default:
+ return null;
}
}
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPCompositeFactory.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPCompositeFactory.java
index b767136..5684c6d 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPCompositeFactory.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPCompositeFactory.java
@@ -70,6 +70,7 @@
}
/**
+ * Util method to create a composite which allows to ceate an ECP project.
*
* @param providers the providers to be considered to create a new project
* @return A {@link CreateProjectComposite} allowing to create a new project
@@ -78,16 +79,38 @@
return new CreateProjectCompositeImpl(providers);
}
+ /**
+ * Util method to create a composite which allows to select Classes from {@link EPackage}s with a checkbox.
+ *
+ * @param ePackages The {@link EPackage}s to select from.
+ * @return The {@link CheckedModelClassComposite}
+ */
public static CheckedModelClassComposite getCheckedModelClassComposite(Collection<EPackage> ePackages) {
return new CheckedSelectModelClassCompositeImpl(new HashSet<EPackage>(), ePackages, new HashSet<EClass>());
}
+ /**
+ * Util method to create a composite which allows to select an {@link EClass} based on all known {@link EPackage}s
+ * in the registry by applying the provided filters.
+ *
+ * @param unsupportedEPackages The {@link EPackage}s that should not be available (blacklist)
+ * @param filteredEPackages The {@link EPackage}s that should be available (whitelist)
+ * @param filteredEClasses The {@link EClass}es that should be available (whitelist)
+ * @return The {@link SelectionComposite} based on a {@link TreeViewer}
+ */
public static SelectionComposite<TreeViewer> getSelectModelClassComposite(
Collection<EPackage> unsupportedEPackages, Collection<EPackage> filteredEPackages,
Collection<EClass> filteredEClasses) {
return new SelectModelClassCompositeImpl(unsupportedEPackages, filteredEPackages, filteredEClasses);
}
+ /**
+ * Util method to create a composite which allows to select an {@link EClass} based on all known {@link EPackage}s
+ * in the registry by applying the filters in the provided project.
+ *
+ * @param project The {@link ECPProject} to use as a filter
+ * @return The {@link SelectionComposite} based on a {@link TreeViewer}
+ */
public static SelectionComposite<TreeViewer> getSelectModelClassComposite(ECPProject project) {
return new ECPProjectSelectionModelClassCompositeImpl(project);
}
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPViewerFactory.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPViewerFactory.java
index b2629fc..b6b3266 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPViewerFactory.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/common/ECPViewerFactory.java
@@ -44,11 +44,24 @@
import org.eclipse.swt.widgets.Composite;
/**
- * @author Eugen
+ * Utility class to create components for ECP.
+ *
+ * @author Eugen Neufeld
*
*/
-public class ECPViewerFactory {
+public final class ECPViewerFactory {
+ private ECPViewerFactory() {
+ }
+
+ /**
+ * Create the ECP ModelExplorer View which is based on the {@link TreeViewer}.
+ *
+ * @param parent The {@link Composite} to create onto
+ * @param hasDnD Whether dnd should be enabled
+ * @param labelDecorator The {@link ILabelDecorator} to use on labels.
+ * @return The created {@link TreeViewer}
+ */
public static TreeViewer createModelExplorerViewer(Composite parent, boolean hasDnD,
ILabelDecorator labelDecorator) {
final ModelContentProvider contentProvider = new ModelContentProvider();
@@ -90,20 +103,15 @@
return viewer;
}
- /**
- * @param contentProvider
- * @param viewer
- * @return
- */
private static ECPDropAdapter getDropAdapter(ModelContentProvider contentProvider, TreeViewer viewer) {
ECPDropAdapter dropAdapter = null;
// read extensionpoint, if no defined take default
final IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- "org.eclipse.emf.ecp.ui.dropAdapter");
+ "org.eclipse.emf.ecp.ui.dropAdapter"); //$NON-NLS-1$
for (final IExtension extension : extensionPoint.getExtensions()) {
final IConfigurationElement configurationElement = extension.getConfigurationElements()[0];
try {
- dropAdapter = (ECPDropAdapter) configurationElement.createExecutableExtension("class");
+ dropAdapter = (ECPDropAdapter) configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
dropAdapter.setViewer(viewer);
break;
} catch (final CoreException ex) {
@@ -116,20 +124,15 @@
return dropAdapter;
}
- /**
- * @param contentProvider
- * @param viewer
- * @return
- */
private static ILabelProvider getLabelProvider(ModelContentProvider contentProvider) {
IECPLabelProvider labelProvider = null;
// read extensionpoint, if no defined take default
final IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
- "org.eclipse.emf.ecp.ui.labelProvider");
+ "org.eclipse.emf.ecp.ui.labelProvider"); //$NON-NLS-1$
for (final IExtension extension : extensionPoint.getExtensions()) {
final IConfigurationElement configurationElement = extension.getConfigurationElements()[0];
try {
- labelProvider = (IECPLabelProvider) configurationElement.createExecutableExtension("class");
+ labelProvider = (IECPLabelProvider) configurationElement.createExecutableExtension("class"); //$NON-NLS-1$
labelProvider.setModelContextProvider(contentProvider);
return labelProvider;
} catch (final CoreException ex) {
@@ -141,6 +144,13 @@
return labelProvider;
}
+ /**
+ * Create the ECP RepositoryExplorer View which is based on the {@link TreeViewer}.
+ *
+ * @param parent The {@link Composite} to create onto
+ * @param labelDecorator The {@link ILabelDecorator} to use on labels
+ * @return The create {@link TreeViewer}
+ */
public static TreeViewer createRepositoryExplorerViewer(Composite parent, ILabelDecorator labelDecorator) {
final RepositoriesContentProvider contentProvider = new RepositoriesContentProvider();
final TreeViewer viewer = TreeViewerFactory.createTreeViewer(parent, new RepositoriesLabelProvider(
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 d91440b..8dd5db5 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation Connector Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.connector;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.connector;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.jface.resource;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 a4eba49..7d1424b 100644
--- a/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 f857b3a..09eb22a 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation Service
Bundle-SymbolicName: org.eclipse.emf.ecp.validation;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.api;version="1.22.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
+Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.api;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.validation
Service-Component: OSGI-INF/validationService.xml
diff --git a/bundles/org.eclipse.emf.ecp.validation/pom.xml b/bundles/org.eclipse.emf.ecp.validation/pom.xml
index fc332ae..15027d4 100644
--- a/bundles/org.eclipse.emf.ecp.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 72fe2b2..a920e0e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation View to Editor Bridge
Bundle-SymbolicName: org.eclipse.emf.ecp.validationvieweditorbridge;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.validationvieweditorbridge
Import-Package: org.eclipse.jface.viewers;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
index 40b3e92..cc7c6f6 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b85e87e..db73cc1 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,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 77cd7bc..b1dce5e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 03cc0e0..1d61ddb 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.model
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 604ac8b..b21856c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 ffd75f3..72f0454 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Categorization SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.categorization.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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",
@@ -39,12 +39,6 @@
org.eclipse.ui.views.properties;version="0.0.0";resolution:=optional,
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.swt
-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,
- OSGI-INF/categorizationRevealProvider.xml
+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,OSGI-INF/categorizationRevealProvider.xml
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 2dbc7a8..768a4a8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 deb8514..fda8663 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
@@ -26,7 +26,6 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecp.edit.internal.swt.util.OverlayImageDescriptor;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
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;
@@ -53,6 +52,7 @@
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.emfforms.spi.swt.core.ui.SWTValidationHelper;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.ImageDescriptor;
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 cea82c1..b765c6a 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
@@ -10,7 +10,7 @@
*
* Contributors:
* Eugen Neufeld - initial API and implementation
- * Christian W. Damus - bug 548592
+ * Christian W. Damus - bugs 548592, 552852
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.categorization.swt;
@@ -200,6 +200,7 @@
.createEmptyGridDescription());
for (final SWTGridCell gridCell : gridDescription.getGrid()) {
final Control render = renderer.render(gridCell, composite);
+ renderer.finalizeRendering(composite);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true)
.applyTo(render);
if (useScrolledContent) {
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 505a869..00a3e6c 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.compoundcontrol.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 d83643d..444da36 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1b76813..1c1c243 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.compoundcontrol.model
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 15c0e80..71ad6f2 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/.project b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/.project
index 5ca86d3..8207932 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/.project
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 eb8e992..d03865b 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,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: Compound Control SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/CompoundControlDIRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 0aab5b9..8ad04ec 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 cdeb9c4..e4df1b4 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Compound Control Tooling
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.tooling;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 4422d83..26bff80 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6af3447..eed0d98 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,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Locale View Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.locale;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.context.locale
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 bc95a2e..0aa2d46 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8c4bea6..9d7fac1 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,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Context
Bundle-SymbolicName: org.eclipse.emf.ecp.view.context;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.context;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.context;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: org.eclipse.emf.ecp.view.context
-Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)";resolution:=optional,
- org.eclipse.emfforms.common;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
-Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/viewModelContextCF.xml
+Bundle-ActivationPolicy: lazy
+Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)";resolution:=optional,
+ org.eclipse.emfforms.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
+Automatic-Module-Name: org.eclipse.emf.ecp.view.context
diff --git a/bundles/org.eclipse.emf.ecp.view.context/pom.xml b/bundles/org.eclipse.emf.ecp.view.context/pom.xml
index 39af20b..f5c6bfb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 93eaa96..9e1159f 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,35 +2,33 @@
Bundle-ManifestVersion: 2
Bundle-Name: Multireference
Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.22.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.23.0";x-friends:="org.eclipse.emfforms.ide.view.multisegment,org.eclipse.emf.ecp.ui.view.editor.controls"
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/multiReferenceRendererService.xml,
- OSGI-INF/LinkOnlyMultiReferenceRendererService.xml,
- OSGI-INF/multiReferenceRevealProvider.xml
+Service-Component: OSGI-INF/multiReferenceRendererService.xml,OSGI-INF/LinkOnlyMultiReferenceRendererService.xml,OSGI-INF/multiReferenceRevealProvider.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.internal.core.services.label;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.internal.core.services.label;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.23.0,1.24.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/pom.xml b/bundles/org.eclipse.emf.ecp.view.control.multireference/pom.xml
index a530d5b..85a889d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 ffcd9d3..7b3830a 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
@@ -12,7 +12,7 @@
* Eugen Neufeld - initial API and implementation
* Lucas Koehler - use data binding services
* Martin Fleck - bug 487101
- * Christian W. Damus - bugs 527736, 548592
+ * Christian W. Damus - bugs 527736, 548592, 552385
******************************************************************************/
package org.eclipse.emf.ecp.view.internal.control.multireference;
@@ -35,6 +35,7 @@
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecp.edit.internal.swt.controls.TableViewerColumnBuilder;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
import org.eclipse.emf.ecp.edit.spi.DeleteService;
import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
import org.eclipse.emf.ecp.edit.spi.ReferenceService;
@@ -779,7 +780,9 @@
private void enableDeleteButton(boolean baseEnable, int listSize, int selectionIndex) {
if (btnDelete != null && showDeleteButton()) {
- btnDelete.setEnabled(baseEnable && listSize > 0 && selectionIndex != -1);
+ btnDelete.setEnabled(baseEnable && listSize > 0 && selectionIndex != -1
+ && ConditionalDeleteService.getDeleteService(getViewModelContext())
+ .canDelete(tableViewer.getStructuredSelection().toList()));
}
}
@@ -1231,7 +1234,7 @@
if (getVElement().getDiagnostic() == null) {
return;
}
- validationIcon.setImage(getValidationIcon(getVElement().getDiagnostic().getHighestSeverity()));
+ validationIcon.setImage(getValidationIcon());
validationIcon.setToolTipText(ECPTooltipModifierHelper.modifyString(getVElement().getDiagnostic()
.getMessage(), null));
}
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.core.swt/.settings/.api_filters
index 58fc119..f5ac3e1 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/.settings/.api_filters
@@ -27,6 +27,12 @@
<message_argument value="AbstractControlSWTRenderer()"/>
</message_arguments>
</filter>
+ <filter comment="The internalClass SWTValidationHelper was moved" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer"/>
+ <message_argument value="AbstractControlSWTRenderer(VCONTROL, ViewModelContext, ReportService, EMFFormsDatabinding, EMFFormsLabelProvider, VTViewTemplateProvider, SWTValidationHelper)"/>
+ </message_arguments>
+ </filter>
<filter comment="SPI Change in 1.6" id="338792546">
<message_arguments>
<message_argument value="org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer"/>
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 52e2a0e..945975a 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,35 +2,35 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Core SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.22.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.22.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.23.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.23.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.edit.spi.swt.util",
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.22.0"
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.locale;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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/pom.xml b/bundles/org.eclipse.emf.ecp.view.core.swt/pom.xml
index 3d4c6c6..e6e532b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java
index 7c2a91c..536f409 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer.java
@@ -25,13 +25,13 @@
import org.eclipse.emf.databinding.EMFDataBindingContext;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.model.LabelAlignment;
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.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.renderer.NoPropertyDescriptorFoundExeption;
import org.eclipse.emf.ecp.view.spi.renderer.NoRendererFoundException;
import org.eclipse.emf.ecp.view.spi.swt.reporting.RenderingFailedReport;
@@ -52,6 +52,8 @@
import org.eclipse.emfforms.spi.swt.core.EMFFormsControlProcessorService;
import org.eclipse.emfforms.spi.swt.core.SWTDataElementIdHelper;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -81,6 +83,7 @@
private final Map<Integer, Color> severityBackgroundColorMap = new LinkedHashMap<Integer, Color>();
private final Map<Integer, Color> severityForegroundColorMap = new LinkedHashMap<Integer, Color>();
private final Map<Integer, Image> severityIconMap = new LinkedHashMap<Integer, Image>();
+ private final SWTValidationUiService validationUiService;
/**
* Default constructor.
@@ -96,13 +99,27 @@
public AbstractControlSWTRenderer(VCONTROL vElement, ViewModelContext viewContext, ReportService reportService,
EMFFormsDatabinding emfFormsDatabinding, EMFFormsLabelProvider emfFormsLabelProvider,
VTViewTemplateProvider vtViewTemplateProvider) {
- super(vElement, viewContext, reportService);
- this.emfFormsDatabinding = emfFormsDatabinding;
- this.emfFormsLabelProvider = emfFormsLabelProvider;
- this.vtViewTemplateProvider = vtViewTemplateProvider;
- viewModelDBC = new EMFDataBindingContext();
- viewContext.registerRootDomainModelChangeListener(this);
- isDisposed = false;
+ this(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider,
+ viewContext.getService(SWTValidationUiService.class));
+ }
+
+ /**
+ * Additional constructor allowing to specify a custom {@link SWTValidationHelper}.
+ *
+ * @param vElement the view model element to be rendered
+ * @param viewContext the view context
+ * @param emfFormsDatabinding The {@link EMFFormsDatabinding}
+ * @param emfFormsLabelProvider The {@link EMFFormsLabelProvider}
+ * @param reportService The {@link ReportService}
+ * @param vtViewTemplateProvider The {@link VTViewTemplateProvider}
+ * @param swtValidationHelper The {@link SWTValidationHelper}
+ * @since 1.23
+ */
+ public AbstractControlSWTRenderer(VCONTROL vElement, ViewModelContext viewContext, ReportService reportService,
+ EMFFormsDatabinding emfFormsDatabinding, EMFFormsLabelProvider emfFormsLabelProvider,
+ VTViewTemplateProvider vtViewTemplateProvider, SWTValidationHelper swtValidationHelper) {
+ this(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider);
+ this.swtValidationHelper = swtValidationHelper;
}
/**
@@ -114,14 +131,20 @@
* @param emfFormsLabelProvider The {@link EMFFormsLabelProvider}
* @param reportService The {@link ReportService}
* @param vtViewTemplateProvider The {@link VTViewTemplateProvider}
- * @param swtValidationHelper The {@link SWTValidationHelper}
- * @since 1.6
+ * @param validationUiService The {@link SWTValidationUiService}
+ * @since 1.23
*/
public AbstractControlSWTRenderer(VCONTROL vElement, ViewModelContext viewContext, ReportService reportService,
EMFFormsDatabinding emfFormsDatabinding, EMFFormsLabelProvider emfFormsLabelProvider,
- VTViewTemplateProvider vtViewTemplateProvider, SWTValidationHelper swtValidationHelper) {
- this(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider);
- this.swtValidationHelper = swtValidationHelper;
+ VTViewTemplateProvider vtViewTemplateProvider, SWTValidationUiService validationUiService) {
+ super(vElement, viewContext, reportService);
+ this.emfFormsDatabinding = emfFormsDatabinding;
+ this.emfFormsLabelProvider = emfFormsLabelProvider;
+ this.vtViewTemplateProvider = vtViewTemplateProvider;
+ this.validationUiService = validationUiService;
+ viewModelDBC = new EMFDataBindingContext();
+ viewContext.registerRootDomainModelChangeListener(this);
+ isDisposed = false;
}
/**
@@ -255,7 +278,7 @@
* </p>
*
* @return
- * {@code true} if the Control SWT renderer can handle the {@link EMFFormsControlProcessorService} itself,
+ * {@code true} if the Control SWT renderer can handle the {@link EMFFormsControlProcessorService} itself,
* {@code false} otherwise.
* @since 1.8
*/
@@ -320,7 +343,10 @@
*
* @param severity the severity of the {@link org.eclipse.emf.common.util.Diagnostic}
* @return the icon to be displayed, or <code>null</code> when no icon is to be displayed
+ * @deprecated use {@link #getValidationIcon()} for default behavior or use the
+ * {@link SWTValidationUiService} if you need to get the color for a specific diagnostic.
*/
+ @Deprecated
protected final Image getValidationIcon(int severity) {
if (!severityIconMap.containsKey(severity)) {
final Image validationIcon = swtValidationHelper.getValidationIcon(severity, getVElement(),
@@ -331,11 +357,24 @@
}
/**
+ * Returns the validation icon for the current validation result of this control's {@link VElement}.
+ *
+ * @return the icon to be displayed, or <code>null</code> when no icon is to be displayed
+ * @since 1.23
+ */
+ protected final Image getValidationIcon() {
+ return validationUiService.getValidationIcon(getVElement(), getViewModelContext());
+ }
+
+ /**
* Returns the background color for a control with the given validation severity.
*
* @param severity severity the severity of the {@link org.eclipse.emf.common.util.Diagnostic}
* @return the color to be used as a background color
+ * @deprecated use {@link #getValidationBackgroundColor()} for default behavior or use the
+ * {@link SWTValidationUiService} if you need to get the color for a specific diagnostic.
*/
+ @Deprecated
protected final Color getValidationBackgroundColor(int severity) {
if (isDisposed) {
return null;
@@ -350,12 +389,28 @@
}
/**
+ * Returns the background color for the current validation result of this control's {@link VElement}.
+ *
+ * @return the color to be used as a background color
+ * @since 1.23
+ */
+ protected final Color getValidationBackgroundColor() {
+ if (isDisposed) {
+ return null;
+ }
+ return validationUiService.getValidationBackgroundColor(getVElement(), getViewModelContext());
+ }
+
+ /**
* Returns the foreground color for a control with the given validation severity.
*
* @param severity severity the severity of the {@link org.eclipse.emf.common.util.Diagnostic}
* @return the color to be used as a foreground color
* @since 1.10
+ * @deprecated use {@link #getValidationForegroundColor()} for default behavior or use the
+ * {@link SWTValidationUiService} if you need to get the color for a specific diagnostic.
*/
+ @Deprecated
protected final Color getValidationForegroundColor(int severity) {
if (isDisposed) {
return null;
@@ -371,6 +426,20 @@
}
/**
+ * Returns the foreground color for the current validation result of this control's {@link VElement}.
+ *
+ * @return the color to be used as a foreground color
+ * @since 1.23
+ */
+ protected final Color getValidationForegroundColor() {
+ if (isDisposed) {
+ return null;
+ }
+ return validationUiService.getValidationForegroundColor(getVElement(), getViewModelContext());
+
+ }
+
+ /**
* Creates a new {@link DataBindingContext}.
*
* @return a new {@link DataBindingContext} each time this method is called
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTRenderer.java
index e3a56d6..daad69a 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTRenderer.java
@@ -19,7 +19,6 @@
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.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecp.view.internal.core.swt.Activator;
@@ -540,15 +539,10 @@
if (validationIcon.isDisposed()) {
return;
}
- int highestSeverity = Diagnostic.OK;
- // no diagnostic set
- if (getVElement().getDiagnostic() != null) {
- highestSeverity = getVElement().getDiagnostic().getHighestSeverity();
- }
- validationIcon.setImage(getValidationIcon(highestSeverity));
- setValidationColor(editControl, getValidationBackgroundColor(highestSeverity));
- setValidationForegroundColor(editControl, getValidationForegroundColor(highestSeverity));
+ validationIcon.setImage(getValidationIcon());
+ setValidationColor(editControl, getValidationBackgroundColor());
+ setValidationForegroundColor(editControl, getValidationForegroundColor());
if (getVElement().getDiagnostic() == null) {
validationIcon.setToolTipText(null);
} else {
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 7f9fbf2..2a848a6 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 22d6715..e54cea7 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/.project b/bundles/org.eclipse.emf.ecp.view.custom.model/.project
index b53228e..c31a848 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/.project
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/.project
@@ -46,6 +46,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 4fe39a7..a3b7fc3 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0",
- org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.spi.asserts;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.common.spi;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.spi.asserts;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.model
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 29550ba..37bf216 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
index abd61e6..91638aa 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,20 +2,20 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.23.0,1.24.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.23.0,1.24.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.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.ui.swt.di
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 fb7ece9..a7b40c6 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.di/src/org/eclipse/emf/ecp/view/custom/ui/swt/di/renderer/DICustomControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/src/org/eclipse/emf/ecp/view/custom/ui/swt/di/renderer/DICustomControlSWTRenderer.java
index 08de5f9..8a7b253 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/src/org/eclipse/emf/ecp/view/custom/ui/swt/di/renderer/DICustomControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/src/org/eclipse/emf/ecp/view/custom/ui/swt/di/renderer/DICustomControlSWTRenderer.java
@@ -23,6 +23,7 @@
import org.eclipse.emf.ecp.view.spi.renderer.NoRendererFoundException;
import org.eclipse.emfforms.spi.common.report.ReportService;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.osgi.framework.Bundle;
@@ -36,6 +37,8 @@
public class DICustomControlSWTRenderer extends CustomControlSWTRenderer {
/**
+ * Legacy constructor.
+ *
* @param vElement the view model element to be rendered
* @param viewContext the view context
* @param factory the {@link ReportService}
@@ -44,6 +47,19 @@
super(vElement, viewContext, factory);
}
+ /**
+ * Default constructor.
+ *
+ * @param vElement the view model element to be rendered
+ * @param viewContext the view context
+ * @param factory the {@link ReportService}
+ * @param validationUiService the {@link SWTValidationUiService} to use
+ */
+ public DICustomControlSWTRenderer(VCustomControl vElement, ViewModelContext viewContext, ReportService factory,
+ SWTValidationUiService validationUiService) {
+ super(vElement, viewContext, factory, validationUiService);
+ }
+
private IEclipseContext eclipseContext;
/**
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 3655958..2e4d63b 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,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: Custom View SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
- org.eclipse.emf.ecp.view.spi.custom.swt;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.custom.swt;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
+ org.eclipse.emf.ecp.view.spi.custom.swt;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.23.0,1.24.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 eb11291..763ce06 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.22.0-SNAPSHOT</version>
+ <version>1.23.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/src/org/eclipse/emf/ecp/view/spi/custom/swt/CustomControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/CustomControlSWTRenderer.java
index fac6b21..69b6625 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/CustomControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/src/org/eclipse/emf/ecp/view/spi/custom/swt/CustomControlSWTRenderer.java
@@ -15,7 +15,6 @@
package org.eclipse.emf.ecp.view.spi.custom.swt;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.custom.model.VCustomControl;
import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
@@ -27,6 +26,7 @@
import org.eclipse.emfforms.spi.swt.core.EMFFormsControlProcessorService;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -43,8 +43,10 @@
*/
public class CustomControlSWTRenderer extends AbstractSWTRenderer<VCustomControl> {
+ private final SWTValidationUiService validationUiService;
+
/**
- * Default Constructor.
+ * Legacy Constructor.
*
* @param vElement the view element to be rendered
* @param viewContext The view model context
@@ -53,7 +55,22 @@
*/
public CustomControlSWTRenderer(final VCustomControl vElement, final ViewModelContext viewContext,
ReportService reportService) {
+ this(vElement, viewContext, reportService, viewContext.getService(SWTValidationUiService.class));
+ }
+
+ /**
+ * Default Constructor.
+ *
+ * @param vElement the view element to be rendered
+ * @param viewContext The view model context
+ * @param reportService the ReportService to use
+ * @param validationUiService the {@link SWTValidationUiService} to use
+ * @since 1.23
+ */
+ public CustomControlSWTRenderer(final VCustomControl vElement, final ViewModelContext viewContext,
+ ReportService reportService, SWTValidationUiService validationUiService) {
super(vElement, viewContext, reportService);
+ this.validationUiService = validationUiService;
}
private ECPAbstractCustomControlSWT swtCustomControl;
@@ -261,7 +278,7 @@
final VDiagnostic diag = getVElement().getDiagnostic();
if (diag != null && validationIcon != null && !validationIcon.isDisposed()) {
- validationIcon.setImage(getValidationIcon(diag.getHighestSeverity()));
+ validationIcon.setImage(getValidationIcon());
validationIcon.setToolTipText(diag.getMessage());
}
if (swtCustomControl != null) {
@@ -271,7 +288,7 @@
});
}
- private Image getValidationIcon(int severity) {
- return SWTValidationHelper.INSTANCE.getValidationIcon(severity, getVElement(), getViewModelContext());
+ private Image getValidationIcon() {
+ return validationUiService.getValidationIcon(getVElement(), getViewModelContext());
}
}
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 35bc139..033910b 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Edapt
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edapt.history;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.edapt
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 b4af80f..a538f7e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 066e312..c394449 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.group.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 100e52f..f8f6924 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 94ce71f..798fad9 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.group.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.group.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.group.model
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 a13c01c..95530d3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
index d8b4367..74b8d65 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,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: Collapsable Group
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.collapsable
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.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.8
Service-Component: OSGI-INF/collapsableGroupRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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 67b7048..85f8ae9 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 fa5bec3..4afd973 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,20 +2,20 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 8a14f2e..8e2180b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c017f37..7ddede9 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,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: AlignmentGroup SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.embedded
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/embeddedGroupRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 bb451e7..cdcac18 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 5b4f901..9f33fce 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,27 +2,27 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.22.0",
- org.eclipse.emfforms.internal.group.swt;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.23.0",
+ org.eclipse.emfforms.internal.group.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/groupRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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 634d4fd..0d4d011 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 8e31222..a5b1a43 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.groupedgrid.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 8879cd7..2ced840 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 df73415..6da4bd0 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.groupedgrid.model
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 bbf2610..c2d6b97 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 7d02c05..817b412 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,20 +2,20 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/GroupedGridSWTRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 75ae8b8..3c337f7 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 4c52198..b004030 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 d7bcc6b..655a0f9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 155c829..2288fec 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Horizontal View Model
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.model
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 e201461..2359940 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 db2778e..ac46643 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,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Horizontal UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/horizontalLayoutRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.internal.core.swt;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.internal.core.swt;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 abc168b..cef336b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ab0e97a..a358919 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.indexdmr.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 a029aea..7400e02 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 d518678..5a07d01 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.indexdmr.model
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 217957a..f1daa7d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0b88f47..efc75c7 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,30 +2,30 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Index DMR Tooling
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.tooling;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.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)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/PrefixDmrDomainModelReferenceRendererService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 4eb82cb..e8c39a8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 01a1643..614c989 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.keyattributedmr.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 f3255af..9ab930c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 e357b02..1564bfe 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.keyattributedmr.model
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 4ea7a35..89ef981 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 01e383b..1f1e761 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,31 +2,31 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/KeyValueControlRendererService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 e8574c9..ed95204 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0f7e6e7..1a82f82 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.label.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 d08d3ae..6e1b092 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 4eb8e51..0ffcc4f 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.label.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.label.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.label.model
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 9b3ec82..5840eee 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 854b424..5ef3ca0 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,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Label Rap
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.rap
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/labelRAPRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.23.0,1.24.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
Automatic-Module-Name: org.eclipse.emf.ecp.view.label.rap
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 7d8ed1d..960bddf 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1d01403..4d74517 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,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Label UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.ui.swt
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.label.swt;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.label.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/labelRendererService.xml
Bundle-ActivationPolicy: lazy
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.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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 348a265..e8971a2 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c6babaf..0b1af75 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 7ad06ea..feb7345 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 9a43ded..dcf80a9 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.model
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 1c4aeb3..3e85280 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 d5ce8cd..e0969b0 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,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Tooling
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.tooling;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.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.common.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.tooling
-Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 a4e9a71..e29a260 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 589f3d9..7001ee3 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Migrator
Bundle-SymbolicName: org.eclipse.emf.ecp.view.migrator;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.22.0",
- org.eclipse.emf.ecp.spi.view.migrator.string;version="1.22.0",
- org.eclipse.emf.ecp.view.migrator;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.23.0",
+ org.eclipse.emf.ecp.spi.view.migrator.string;version="1.23.0",
+ org.eclipse.emf.ecp.view.migrator;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
index 3bbfd85..135ef2c 100644
--- a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 453f8a1..a6d4df2 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,25 +2,25 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.common.di.annotations;version="1.22.0",
- org.eclipse.emf.ecp.view.model.common.di.messages;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.common.di;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.model.common.di.annotations;version="1.23.0",
+ org.eclipse.emf.ecp.view.model.common.di.messages;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.common.di;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.0,1.9.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common.di
-Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/viewServiceSupplier.xml
+Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
+Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common.di
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 ad85726..3f750a5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f598599..1816dc9 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,24 +2,24 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common View Model Classes
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.22.0",
- org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.22.0",
- org.eclipse.emf.ecp.view.model.common.util;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.common.callback;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.23.0",
+ org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.23.0",
+ org.eclipse.emf.ecp.view.model.common.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.common.callback;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.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)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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 2423074..b917804 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 9124c56..0519126 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 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.1.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.edapt
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 49221c0..88315f9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 855e496..d6221a3 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.model.provider;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.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/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
index e17c972..dc46945 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.edit/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 e92c3ac..cf65c16 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 @@
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.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.project.handlers;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.project.installer
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 87748fc..cbea5db 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 c50391a..0545d7c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.presentation;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer",
- org.eclipse.emf.ecp.view.model.refactoring;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.actions;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.presentation;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer",
+ org.eclipse.emf.ecp.view.model.refactoring;version="1.23.0";x-internal:=true
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.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.ide.view.service;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
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 e0eaa84..fe036fe 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 2564b0f..3942e8e 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Generator
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.generator;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.generator
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 0a439df..0792881 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.22.0-SNAPSHOT</version>
+ <version>1.23.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/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.preview.common/META-INF/MANIFEST.MF
index 169358c..05f1630 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,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Preview Common
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.common;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.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.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)"
Import-Package: org.eclipse.core.resources;version="0.0.0",
- org.eclipse.emf.ecp.ui.view.swt;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.locale;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.23.0,1.24.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/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.common/pom.xml
index e0588eb..5896066 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 396ce24..ae954da 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Preview View
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.e3;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.preview;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.22.0,1.23.0)";resolution:=optional,
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)";resolution:=optional
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.23.0,1.24.0)";resolution:=optional,
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.commands;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 19bab67..896446b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 0b3d7c9..b2a54af 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: XMI View Model Provider
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi;version="1.22.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.internal.view.model.provider.xmi;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.xmi
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 c706824..9574316 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 e7f3958..fc9b943 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.model.reporting;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.model.internal.reporting;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.model.reporting;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.model.util;version="1.23.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
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.model
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)"
diff --git a/bundles/org.eclipse.emf.ecp.view.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
index 1384e26..a250385 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 eecfc8f..89dd77e 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: Rule Model Edit Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 0b5005b..f3799f8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 3e79a8e..e9be4ac 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,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Rule Model Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0",
- org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.model
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)"
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 66953f4..21d28e5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1ef8f47..710d1ac 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Rule
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.22.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.23.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.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml,
OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml,
@@ -25,7 +25,7 @@
OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.TrueConditionService.xml,
OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.IsProxyConditionService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="1.2.0"
Automatic-Module-Name: org.eclipse.emf.ecp.view.rule
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
index 99444cc..2b61399 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
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 a0139e8..d93c466 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.section.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 3e76772..e7e36f8 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 b224db2..df9c6dd 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.section.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.section.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.section.model
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 9fbd990..7a0e198 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.22.0-SNAPSHOT</version>
+ <version>1.23.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/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
index 13bda5d..7c2808a 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,27 +2,27 @@
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.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.section.swt;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.section.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.section.swt;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.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)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)"
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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.section.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
index 2f4ced6..88c1870 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 3b10163..8b22e4c 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 ba4cbe2..dbc66ad 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ab1f9ef..aeb3b27 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,7 +11,7 @@
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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.model
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 67cd348..4d519a8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 694bfe7..ab0cace 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,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.stack.ui.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.ui.swt
Service-Component: OSGI-INF/SWTStackLayoutRendererService.xml,OSGI-INF/stackItemRendererService.xml
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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 061ccb2..5221be3 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 5246ed1..1d100a2 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,8 +2,8 @@
Bundle-ManifestVersion: 2
Bundle-Name: Stack Layout Viewmodel
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.viewmodel;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.viewmodel
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 3154b1f..7a70662 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 cb1bb72..7a1dec8 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default LayoutProvider
Bundle-SymbolicName: org.eclipse.emf.ecp.view.swt.layout;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.swt.internal.layout.ECPLayoutProvider.xml
Bundle-ActivationPolicy: lazy
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 80cef81..c9a4391 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b5043cd..a894a1f 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 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.celleditor.rcp
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 877cf2f..eb7d83e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 86b97a5..4b3a4c1 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP View Table Column Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.columnservice;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.columnservice;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.columnservice
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 dfcc47f..6480670 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 7931f37..008c91a 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 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.edapt
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 80497d9..1d90736 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 5071bfc..1d2afad 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 5ab3fce..1b26646 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 31b8b20..9a40448 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,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.table.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.generator;version="1.23.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.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.table.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emf.ecp.common.spi.asserts;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.common.spi.asserts;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="1.2.0"
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.model
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 34764d2..6030230 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
index 5902be5..81bf416 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/META-INF/MANIFEST.MF
@@ -2,34 +2,40 @@
Bundle-ManifestVersion: 2
Bundle-Name: Grid Table Rap
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.nebula.grid.rap;version="1.17.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap;version="1.17.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap.menu;version="1.17.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap.messages;version="1.17.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.rap.nebula.widgets.grid;bundle-version="3.4.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Service-Component: OSGI-INF/RAPGridControlSWTRendererService.xml
+Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.16.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.editsupport;version="1.16.0",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.editsupport;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
@@ -52,10 +58,4 @@
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/RAPGridControlSWTRendererService.xml
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.nebula.grid.rap;version="1.17.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap;version="1.17.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap.menu;version="1.17.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid.rap.messages;version="1.17.0"
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml
index 2e7245b..e5252dd 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid.rap/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.rap</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 3515055..2a4435b 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,38 +2,38 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid.menu;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid.menu;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.table.swt;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
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 116702e..c77c579 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 d52179d..77538dc 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,30 +2,30 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table UI RCP
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.rcp
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/TableControlRCPRendererService.xml,OSGI-INF/TableControlDetailDialogRCPRendererService.xml,OSGI-INF/TableControlDetailPanelRCPRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.rcp
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 9c05b83..0120f25 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 41a96a0..293775f 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,15 +2,15 @@
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.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)"
Import-Package: org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt.persistedstate
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 9b39d09..4814acc 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2035c4f..2cdc501 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
@@ -2,40 +2,40 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.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.internal.table.swt.cell;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.23.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.internal.table.swt.cell;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
org.eclipse.e4.core.di.annotations;version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.eclipse.jface.bindings.keys;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
@@ -53,10 +53,6 @@
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt
-Service-Component: OSGI-INF/tableDetailDialogRendererService.xml,
- OSGI-INF/tableDetailPanelRendererService.xml,
- OSGI-INF/tableRendererService.xml,
- OSGI-INF/tableRevealProvider.xml,
- OSGI-INF/tableDetailRevealProvider.xml
+Service-Component: OSGI-INF/tableDetailDialogRendererService.xml,OSGI-INF/tableDetailPanelRendererService.xml,OSGI-INF/tableRendererService.xml,OSGI-INF/tableRevealProvider.xml,OSGI-INF/tableDetailRevealProvider.xml
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 0fa4d7b..2608348 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 c2979c7..6e92318 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
@@ -11,7 +11,7 @@
* Contributors:
* Eugen Neufeld - initial API and implementation
* Johannes Faltermeier - refactorings
- * Christian W. Damus - bugs 544116, 544537, 545686, 530314, 547271, 547787, 548592
+ * Christian W. Damus - bugs 544116, 544537, 545686, 530314, 547271, 547787, 548592, 552385
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.table.swt;
@@ -62,6 +62,7 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
import org.eclipse.emf.ecp.edit.spi.DeleteService;
import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
import org.eclipse.emf.ecp.edit.spi.ReferenceService;
@@ -145,6 +146,7 @@
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.emfforms.spi.swt.core.ui.SWTValidationUiService;
import org.eclipse.emfforms.spi.swt.table.AbstractTableViewerComposite;
import org.eclipse.emfforms.spi.swt.table.CellLabelProviderFactory;
import org.eclipse.emfforms.spi.swt.table.ColumnConfiguration;
@@ -633,6 +635,12 @@
deleteRowUserConfirmDialog(deletionList, eObject, eStructuralFeature, getAddButton(),
getRemoveButton());
}
+
+ @Override
+ public boolean canExecute() {
+ return super.canExecute() && ConditionalDeleteService.getDeleteService(getViewModelContext())
+ .canDelete(getActionContext().getViewer().getStructuredSelection().toList());
+ }
};
actionConfigBuilder
@@ -2347,7 +2355,7 @@
return;
}
- validationIcon.setImage(getValidationIcon(getVElement().getDiagnostic().getHighestSeverity()));
+ validationIcon.setImage(getValidationIcon());
showValidationSummaryTooltip(setting.get(), showValidationSummaryTooltip);
if (updates != null) {
@@ -2789,31 +2797,24 @@
return attributeMaps[0].get(object);
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
- */
@Override
public Color getForeground(Object element) {
return table.getForeground();
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
- */
@Override
public Color getBackground(Object element) {
final VDiagnostic vDiagnostic = vTableControl.getDiagnostic();
+ final SWTValidationUiService validationUiService = getViewModelContext()
+ .getService(SWTValidationUiService.class);
if (vDiagnostic == null) {
- return getValidationBackgroundColor(Diagnostic.OK);
+ return validationUiService.getValidationBackgroundColor(Diagnostic.OK_INSTANCE, vTableControl,
+ getViewModelContext());
}
final List<Diagnostic> diagnostic = vDiagnostic.getDiagnostic((EObject) element, feature);
- return getValidationBackgroundColor(diagnostic.size() == 0 ? Diagnostic.OK
- : diagnostic.get(0)
- .getSeverity());
+ final Diagnostic iconDiagnostic = diagnostic.size() == 0 ? Diagnostic.OK_INSTANCE : diagnostic.get(0);
+ return validationUiService.getValidationBackgroundColor(iconDiagnostic, vTableControl,
+ getViewModelContext());
}
/**
@@ -3138,16 +3139,21 @@
@Override
public void update(ViewerCell cell) {
- Integer mostSevere = Diagnostic.OK;
final VDiagnostic vDiagnostic = vTableControl.getDiagnostic();
if (vDiagnostic == null) {
return;
}
final List<Diagnostic> diagnostics = vDiagnostic.getDiagnostics((EObject) cell.getElement());
+ Diagnostic cellDiagnostic;
if (diagnostics.size() != 0) {
- mostSevere = diagnostics.get(0).getSeverity();
+ cellDiagnostic = diagnostics.get(0);
+ } else {
+ // If there is no diagnostic, we assume everything is ok
+ cellDiagnostic = Diagnostic.OK_INSTANCE;
}
- cell.setImage(getValidationIcon(mostSevere));
+ final Image validationIcon = getViewModelContext().getService(SWTValidationUiService.class)
+ .getValidationIcon(cellDiagnostic, getVElement(), getViewModelContext());
+ cell.setImage(validationIcon);
}
@Override
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 be45f89..9730169 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Table Detail Validation (Legacy)
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.validation;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.validation
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 01c9626..581bcc3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF
index bc11852..aeaa118 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.annotation.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.view.template.selector.annotation.model.provider.AnnotationSelectorEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model.provider;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model.provider;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.annotation.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml
index 1b0fcd0..cb42001 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model.edit/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.template.annotation.model.edit</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF
index 1590536..da8d683 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.annotation.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.annotation.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.annotation.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.template.selector.annotation.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.annotation.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.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)";visibility:=reexport,
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.annotation.model
diff --git a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml
index 7eea656..b26e9ef 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.annotation.model/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.template.annotation.model</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 3241bc0..47135f2 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,37 +2,37 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-friends:="org.eclipse.emf.ecp.view.template.annotation.model.edit",
- org.eclipse.emf.ecp.view.template.selector.bool.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.keybinding.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.reference.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.unsettable.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.wrap.model.provider;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.model.provider;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.annotation.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.bool.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.keybinding.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.reference.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.wrap.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 ae8459b..2a37344 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
@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+# Copyright (c) 2011-2019 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 2.0
@@ -192,7 +192,7 @@
_UI_TableValidationStyleProperty_imagePath_feature = Image Path
_UI_ViewTemplate_referencedEcores_feature = Referenced Ecores
_UI_MandatoryStyleProperty_type = Mandatory Style
-_UI_MandatoryStyleProperty_highliteMandatoryFields_feature = Highlite Mandatory Fields
+_UI_MandatoryStyleProperty_highliteMandatoryFields_feature = Highlight Mandatory Fields
_UI_MandatoryStyleProperty_mandatoryMarker_feature = Mandatory Marker
_UI_TextControlEnablementStyleProperty_type = Style Property
_UI_TextControlEnablementStyleProperty_RenderDisableAsEditable_feature = Render Disable As Editable
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 50e7498..ebae1a0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 c5eb0d1..9e5abcc 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
@@ -43,6 +43,12 @@
<message_argument value="org.eclipse.emf.ecore.xmi"/>
</message_arguments>
</filter>
+ <filter id="927989779">
+ <message_arguments>
+ <message_argument value="1.23.0"/>
+ <message_argument value="org.eclipse.emf.ecore.xmi"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.ecp.view.spi.model.reporting.AbstractReport">
<filter comment="SPI Change in 1.6" id="305422471">
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 ef2e3ac..960bf05 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,77 +2,77 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit,org.eclipse.emf.ecp.view.template.annotation.model.edit",
- org.eclipse.emf.ecp.view.template.selector.bool.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.bool.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.background.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.keybinding.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.keybinding.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.keybinding.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.labelwidth.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.reference.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.reference.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tab.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.unsettable.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.unsettable.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.wrap.model;version="1.22.0",
- org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.wrap.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
+Export-Package: org.eclipse.emf.ecp.internal.view.template.model;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit,org.eclipse.emf.ecp.view.template.annotation.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.bool.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.bool.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.background.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.keybinding.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.keybinding.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.keybinding.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.reference.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.reference.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tab.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.unsettable.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.wrap.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.wrap.model.util;version="1.23.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.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.model
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)"
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 4dc8068..06da242 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 7cef32e..d631846 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewTemplate Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.template.service.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.22.0",
- org.eclipse.emf.ecp.view.template.service;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.service;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)"
Import-Package: org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.service
Service-Component: OSGI-INF/viewTemplate.xml,OSGI-INF/ViewTemplateSupplierImpl.xml
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 2c02604..209377c 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<properties>
<jacoco.percentage.instruction>0.1</jacoco.percentage.instruction>
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 bbd6663..1372ed8 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Template Tooling
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.tooling;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.editor;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.22.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.editor;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.23.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,29 +18,29 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.osgi.service.component.annotations;version="1.2.0"
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.tooling
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 556d859..daf2e3e 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 51c2ff9..07bc069 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 4047a2f..4673aa2 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ade44c2..acaa320 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.22.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.23.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.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.model
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 3de56cc..68e01a9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/.project b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/.project
index 8752b36..2e27001 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/.project
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 31b800a..4dc0ffc 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,32 +2,32 @@
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.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.22.0";x-internal:=true,
- org.eclipse.emf.edit.ui.action.ecp;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.edit.ui.action.ecp;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.23.0,1.24.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",
@@ -42,7 +42,6 @@
org.eclipse.ui.views.properties;version="0.0.0";resolution:=optional,
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt
-Service-Component: OSGI-INF/TreeMasterDetailSWTRendererService.xml,
- OSGI-INF/treeRevealProvider.xml
+Service-Component: OSGI-INF/TreeMasterDetailSWTRendererService.xml,OSGI-INF/treeRevealProvider.xml
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 c93c424..4dbd671 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 7afb40c..3b3bb3e 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
@@ -13,7 +13,7 @@
* Eugen Neufeld - Refactoring
* Alexandra Buzila - Refactoring
* Johannes Faltermeier - integration with validation service
- * Christian W. Damus - bugs 543376, 545460, 527686, 548592
+ * Christian W. Damus - bugs 543376, 545460, 527686, 548592, 552385
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;
@@ -49,10 +49,10 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecp.common.spi.ChildrenDescriptorCollector;
import org.eclipse.emf.ecp.edit.internal.swt.util.OverlayImageDescriptor;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
import org.eclipse.emf.ecp.edit.spi.DeleteService;
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.swt.ECPSWTViewRenderer;
import org.eclipse.emf.ecp.view.internal.swt.ContextMenuViewModelService;
import org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt.Activator;
@@ -92,6 +92,7 @@
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.emfforms.spi.swt.core.ui.SWTValidationHelper;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
@@ -866,6 +867,7 @@
.getBundle()
.getResource(deleteImagePath)));
deleteAction.setText("Delete"); //$NON-NLS-1$
+ deleteAction.setEnabled(ConditionalDeleteService.getDeleteService(getViewModelContext()).canDelete(selection.toList()));
manager.add(deleteAction);
}
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 defce4c..3ab903c 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms TreeMasterDetail Services
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.validation
Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
org.eclipse.jface.viewers;version="0.0.0",
org.eclipse.ui.views.properties;version="0.0.0";resolution:=optional
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 57d9d69..e5e48ad 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8aca370..19e9767 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Unset Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.unset
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 ce79945..261e887 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
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 0829036..343533d 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Util RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt.rap
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.rap.rwt;bundle-version="[3.1.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.RAPImageRegistryService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.swt.core.layout;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.swt.core.layout;version="[1.23.0,1.24.0)",
org.eclipse.jface.resource;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
org.osgi.framework;version="1.3.0",
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 7a9f17b..cc4bfb9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 04bb5c1..264eb31 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Util
Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.util.swt;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.util.swt;version="1.23.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.util.swt
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 c4bddb9..bfe0701 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 9fbd528..ec06752 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default Bean Validation
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.default;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.bean.default
Import-Package: javax.validation;version="[1.0.0,2.0.0)"
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 3282bc2..2abc93e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 20044ac..39da285 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms BeanValidation
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.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.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: javax.validation;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 0ae77ca..407bca6 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 ec8494e..6ceedcf 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,31 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Validation Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.internal.validation.Activator
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.22.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.23.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.22.0"
+ org.eclipse.emf.ecp.view.spi.validation;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.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.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emf.ecp.view.validation
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
index a196693..2bee460 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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
index 34bdbc7..5e72eb1 100644
--- 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,34 +10,111 @@
*
* Contributors:
* mat - initial API and implementation
+ * Christian W. Damus - bug 552715
******************************************************************************/
package org.eclipse.emf.ecp.view.internal.validation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
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.common.util.Diagnostic;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.validation.ValidationProvider;
+import org.eclipse.emfforms.common.spi.validation.ValidationService;
/**
* Helper class for fetching ECP validators.
- * See ValidationService#addValidator(org.eclipse.emfforms.common.spi.validation.Validator)
+ * See {@link ValidationService#addValidator(org.eclipse.emfforms.common.spi.validation.Validator)}.
*
* @author Mat Hansen <mhansen@eclipsesource.com>
*/
public final class ValidationProviderHelper {
- private ValidationProviderHelper() {
+ private final Map<ValidationProvider, ValidationProvider> providers = new HashMap<>();
+ private final ViewModelContext context;
+ private final ValidationServiceImpl validationService;
+
+ /**
+ * Initializes me with the validation service that owns me.
+ *
+ * @param context the view model context
+ * @param validationService my owner
+ */
+ ValidationProviderHelper(ViewModelContext context, ValidationServiceImpl validationService) {
+ super();
+
+ this.context = context;
+ this.validationService = validationService;
+ }
+
+ /**
+ * Query the registered validation providers.
+ *
+ * @return the registered validation providers
+ */
+ public Set<ValidationProvider> getValidationProviders() {
+ return Collections.unmodifiableSet(providers.keySet());
+ }
+
+ /**
+ * Initialize my providers.
+ */
+ public void initialize() {
+ fetchValidationProviders().forEach(p -> validationService.addValidationProvider(p, false));
+ }
+
+ /**
+ * Dispose and clear out the registered validation providers.
+ */
+ public void dispose() {
+ try {
+ providers.keySet().forEach(p -> validationService.removeValidationProvider(p, false));
+ } finally {
+ providers.clear();
+ }
+ }
+
+ /**
+ * Wrap a validation {@code provider} to inject my view model {@code context} through the core validation service.
+ *
+ * @param provider the provider to wrap
+ *
+ * @return the wrapper
+ */
+ ValidationProvider wrap(ValidationProvider provider) {
+ return providers.computeIfAbsent(provider, Wrapper::new);
+ }
+
+ /**
+ * Unwrap a validation {@code provider}.
+ *
+ * @param provider the provider to unwrap (usually a wrapper)
+ *
+ * @return the unwrapped provider
+ */
+ ValidationProvider unwrap(ValidationProvider provider) {
+ return provider instanceof Wrapper ? ((Wrapper) provider).delegate : provider;
}
/**
* Fetch all known ECP validators using the ECP validationProvider extension point.
*
* @return the validators found
+ *
+ * @deprecated Since 1.23, use instances of this class, instead
*/
+ @Deprecated
public static Set<ValidationProvider> fetchValidationProviders() {
final Set<ValidationProvider> providers = new LinkedHashSet<ValidationProvider>();
@@ -58,4 +135,56 @@
return providers;
}
+ //
+ // Nested types
+ //
+
+ /**
+ * A wrapper for a validation provider that injects the current view model context into it.
+ */
+ private final class Wrapper implements ValidationProvider {
+
+ private final ValidationProvider delegate;
+
+ Wrapper(ValidationProvider delegate) {
+ super();
+
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void setContext(ViewModelContext context) {
+ delegate.setContext(context);
+ }
+
+ @Override
+ public void unsetContext(ViewModelContext context) {
+ delegate.unsetContext(context);
+ }
+
+ @SuppressWarnings("unchecked") // The core validation service doesn't write to the list
+ @Override
+ public List<Diagnostic> validate(EObject eObject) {
+ final Iterable<? extends Diagnostic> delegated = delegate.validate(context, eObject);
+ if (delegated == null) {
+ return Collections.emptyList();
+ }
+ if (delegated instanceof List<?>) {
+ return (List<Diagnostic>) delegated;
+ }
+ if (delegated instanceof Collection<?>) {
+ return new ArrayList<>((Collection<Diagnostic>) delegated);
+ }
+ final List<Diagnostic> result = new ArrayList<Diagnostic>();
+ delegated.forEach(result::add);
+ return result;
+ }
+
+ @Override
+ public Iterable<? extends Diagnostic> validate(ViewModelContext userContext, EObject object) {
+ return delegate.validate(userContext, object);
+ }
+
+ }
+
}
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 b92dd7b..2075c87 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
@@ -10,7 +10,7 @@
*
* Contributors:
* Eugen - initial API and implementation
- * Christian W. Damus - bugs 533522, 543160, 545686, 527686, 548761
+ * Christian W. Damus - bugs 533522, 543160, 545686, 527686, 548761, 552127, 552715
******************************************************************************/
package org.eclipse.emf.ecp.view.internal.validation;
@@ -358,6 +358,7 @@
private int propagationThreshold;
private final Set<ValidationUpdateListener> validationUpdateListeners = new LinkedHashSet<>();
+ private ValidationProviderHelper providerHelper;
@Override
public void instantiate(ViewModelContext context) {
@@ -367,6 +368,7 @@
placeholderFactory = new ThresholdDiagnostic.Factory(l10n);
mappingProviderManager = context.getService(EMFFormsMappingProviderManager.class);
controlMapper = context.getService(EMFFormsSettingToControlMapper.class);
+ providerHelper = new ValidationProviderHelper(context, this);
final VElement renderable = context.getViewModel();
if (renderable == null) {
@@ -413,7 +415,7 @@
validationService.setSubstitutionLabelProvider(substitutionLabelProvider);
- registerValidationProviders();
+ providerHelper.initialize();
domainChangeListener = new ValidationDomainModelChangeListener(context);
context.registerDomainChangeListener(domainChangeListener);
@@ -461,18 +463,13 @@
}
}
- private void registerValidationProviders() {
- for (final ValidationProvider provider : ValidationProviderHelper.fetchValidationProviders()) {
- validationService.addValidator(provider);
- }
- }
-
@Override
public void dispose() {
contextTracker.close();
viewModelChangeListeners.forEach((ctx, l) -> ctx.unregisterViewChangeListener(l));
viewModelChangeListeners.clear();
rootContext.unregisterDomainChangeListener(domainChangeListener);
+ providerHelper.dispose();
adapterFactory.dispose();
}
@@ -543,7 +540,14 @@
}
@Override
+ public void validate(Iterable<? extends EObject> objects) {
+ objects.forEach(validationQueue::add);
+ processValidationQueue();
+ }
+
+ @Override
public void validate(Collection<EObject> eObjects) {
+ // Delegate the opposite direction to how the default interface method does
validationQueue.addAll(eObjects);
processValidationQueue();
}
@@ -931,7 +935,9 @@
@Override
public void addValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
- validationService.addValidator(validationProvider);
+ final ValidationProvider provider = providerHelper.wrap(validationProvider);
+ provider.setContext(rootContext);
+ validationService.addValidator(provider);
if (revalidate && rootContext != null) {
validate(getAllEObjectsToValidate(rootContext));
}
@@ -944,7 +950,10 @@
@Override
public void removeValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
- validationService.removeValidator(validationProvider);
+ // Get the wrapper that we made on adding this provider
+ final ValidationProvider provider = providerHelper.wrap(validationProvider);
+ validationService.removeValidator(provider);
+ provider.unsetContext(rootContext);
if (revalidate && rootContext != null) {
validate(getAllEObjectsToValidate(rootContext));
}
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 c47adf8..27c6505 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,20 +10,103 @@
*
* Contributors:
* Eugen Neufeld - initial API and implementation
+ * Christian W. Damus - bug 552715
******************************************************************************/
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.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emfforms.common.spi.validation.Validator;
/**
+ * <p>
* 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.
+ * </p>
+ * <p>
+ * As of the 1.23 release, for validation that requires the current view model context, consider using a subclass of the
+ * nested {@link ContextSensitive} class.
+ * </p>
*
* @author Eugen Neufeld
* @since 1.5
*
*/
-// TODO mark as deprecated
public interface ValidationProvider extends Validator {
+ /**
+ * Initialize me in the view model {@code context} of the {@link ValidationService} to which I have been added.
+ * Note that I could be added to validation services in more than one context.
+ *
+ * @param context the context of the {@link ValidationService} to which I have been added
+ *
+ * @since 1.23
+ */
+ default void setContext(ViewModelContext context) {
+ // Nothing to do
+ }
+
+ /**
+ * Notify me that I have been removed from the {@link ValidationService} in the given {@code context}.
+ * Note that I may still be used in validation services in other contexts.
+ *
+ * @param context the context of the {@link ValidationService} from which I have been removed
+ *
+ * @since 1.23
+ */
+ default void unsetContext(ViewModelContext context) {
+ // Nothing to do
+ }
+
+ /**
+ * Validate an {@code object} in a view model {@code context}.
+ *
+ * @param context the view model context in which validation is occurring
+ * @param object the object to validate
+ * @return the results of validation of the {@code object}, or {@code null} if none
+ *
+ * @since 1.23
+ */
+ default Iterable<? extends Diagnostic> validate(ViewModelContext context, EObject object) {
+ return validate(object);
+ }
+
+ //
+ // Nested types
+ //
+
+ /**
+ * A context-sensitive {@link ValidationProvider} that implements the
+ * {@link ValidationProvider#validate(ViewModelContext, EObject)}
+ * method to the exclusion of {@link Validator#validate(EObject)}.
+ *
+ * @since 1.23
+ */
+ abstract class ContextSensitive implements ValidationProvider {
+
+ /**
+ * Initializes me.
+ */
+ public ContextSensitive() {
+ super();
+ }
+
+ /**
+ * Un-implements the inherited method.
+ *
+ * @throws UnsupportedOperationException always
+ */
+ @Override
+ public final List<Diagnostic> validate(EObject eObject) {
+ throw new UnsupportedOperationException("validate(EObject)"); //$NON-NLS-1$
+ }
+
+ @Override
+ public abstract Iterable<? extends Diagnostic> validate(ViewModelContext context, EObject object);
+
+ }
+
}
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 86a3087..8beedc5 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
@@ -10,11 +10,13 @@
*
* Contributors:
* Eugen - initial API and implementation
- * Christian W. Damus - bug 548761
+ * Christian W. Damus - bugs 548761, 552127
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.validation;
import java.util.Collection;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.EObject;
@@ -85,11 +87,34 @@
void deregisterValidationListener(ViewValidationListener listener);
/**
+ * Validate the {@code objects} provided by an iterable.
+ *
+ * @param objects the iterable from which to obtain objects to validate
+ *
+ * @since 1.23
+ */
+ default void validate(Iterable<? extends EObject> objects) {
+ if (objects instanceof Collection<?>) {
+ // This should be safe because a correct implementation must never modify the collection
+ @SuppressWarnings("unchecked")
+ final Collection<EObject> collection = (Collection<EObject>) objects;
+ validate(collection);
+ } else {
+ // Create a new collection
+ final Collection<EObject> collection = StreamSupport.stream(objects.spliterator(), false)
+ .collect(Collectors.toList());
+ validate(collection);
+ }
+ }
+
+ /**
* Validates all given eObjects.
*
* @param eObjects the eObjects to validate
+ *
+ * @see {@link #validate(Iterable)} for an alternative that is more convenient when validating
+ * content trees covered by EMF {@code TreeIterator}s
*/
- // 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.vertical.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
index 34e65cc..bbe8339 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 4749719..d45cf00 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 bb6df30..f688139 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.model
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 f3009de..3edc936 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 a4fb5d6..ba9972e 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,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Vertical UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/verticalLayoutRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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 361d626..b5f6b58 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 845a829..b0890ef 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.viewproxy.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 9d829b2..3b94db3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 254db00..a7746e6 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,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.viewproxy.model
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 9752fbf..64d2eeb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c55a252..e51611f 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewModel Workspace Migrator
Bundle-SymbolicName: org.eclipse.emf.ecp.view.workspace.migrator;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.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)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.workspace.migrator
Service-Component: OSGI-INF/workspaceMigrator.xml
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 a33ecbc..20ae206 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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 ade3532..34fd47d 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Workspace Integration Core
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.core;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.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.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
index d7cc9c1..45c3437 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF
index 61726b7..d7b647c 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Workspace Integration UI RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui.rap;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
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.common.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.rap.filedialog;bundle-version="[3.1.2,4.0.0)",
org.eclipse.rap.rwt;bundle-version="[3.1.2,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml
index 5d1ee45..c379db2 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui.rap/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.rap</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
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 66de1cc..274a092 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Workspace Integration UI
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
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.common.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml b/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml
index 4823676..0dd977d 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/plugin.xml
@@ -26,18 +26,28 @@
<enabledWhen>
<with
variable="activeMenuSelection">
- <iterate
- ifEmpty="false"
- operator="or">
- <test
- property="org.eclipse.emf.ecp.core.project.open"
- value="true">
- </test>
- <test
- property="org.eclipse.emf.ecp.workspace.ui.testers.canUndo"
- value="true">
- </test>
- </iterate>
+ <iterate
+ ifEmpty="false"
+ operator="or">
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.core.project.open"
+ value="true">
+ </test>
+ </and>
+ <and>
+ <instanceof
+ value="org.eclipse.emf.ecp.core.ECPProject">
+ </instanceof>
+ <test
+ property="org.eclipse.emf.ecp.workspace.ui.testers.canUndo"
+ value="true">
+ </test>
+ </and>
+ </iterate>
</with>
</enabledWhen>
</handler>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
index 6d7b2c4..f8ab526 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 a91d064..f586622 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Minimal RAP EMF Edit UI
Bundle-SymbolicName: org.eclipse.emf.rap.edit.ui.minimal
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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 f354af0..a022fef 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
index fee1942..d9c8ee3 100644
--- a/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Pre-Set Validation
Bundle-SymbolicName: org.eclipse.emfforms.common.prevalidation
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.common.prevalidation;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.common.prevalidation;version="1.23.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/PreSetValidationServiceImpl.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml b/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
index fbd8919..5e80da3 100644
--- a/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
+++ b/bundles/org.eclipse.emfforms.common.prevalidation/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
index b94289c..999eb39 100644
--- a/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common.validation/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Validation
Bundle-SymbolicName: org.eclipse.emfforms.common.validation;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.22.0";x-friends:="org.eclipse.emf.ecp.ide.migration,org.eclipse.emf.ecp.view.validation,org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emfforms.common.spi.validation;version="1.22.0",
- org.eclipse.emfforms.common.spi.validation.exception;version="1.22.0",
- org.eclipse.emfforms.common.spi.validation.filter;version="1.22.0"
+Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.23.0";x-friends:="org.eclipse.emf.ecp.ide.migration,org.eclipse.emf.ecp.view.validation,org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emfforms.common.spi.validation;version="1.23.0",
+ org.eclipse.emfforms.common.spi.validation.exception;version="1.23.0",
+ org.eclipse.emfforms.common.spi.validation.filter;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.common.validation
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.common.validation/pom.xml b/bundles/org.eclipse.emfforms.common.validation/pom.xml
index 800d5fb..4d046a0 100644
--- a/bundles/org.eclipse.emfforms.common.validation/pom.xml
+++ b/bundles/org.eclipse.emfforms.common.validation/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
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
index 1ca57e2..31ffeed 100644
--- 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
@@ -283,6 +283,7 @@
validators.remove(validator);
}
+ @Deprecated
@Override
public void registerValidationFilter(ValidationFilter filter) {
if (filter instanceof ObjectFilter) {
@@ -296,6 +297,7 @@
}
}
+ @Deprecated
@Override
public void unregisterValidationFilter(ValidationFilter filter) {
getObjectFilters().remove(filter);
diff --git a/bundles/org.eclipse.emfforms.common/.project b/bundles/org.eclipse.emfforms.common/.project
index 77ef814..bce8e18 100644
--- a/bundles/org.eclipse.emfforms.common/.project
+++ b/bundles/org.eclipse.emfforms.common/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
index 2e86400..16947e2 100644
--- a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Common
Bundle-SymbolicName: org.eclipse.emfforms.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.common;version="1.22.0",
- org.eclipse.emfforms.internal.common;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.common.converter;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.common.report;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.common;version="1.22.0",
- org.eclipse.emfforms.spi.common.converter;version="1.22.0",
- org.eclipse.emfforms.spi.common.locale;version="1.22.0",
- org.eclipse.emfforms.spi.common.report;version="1.22.0",
- org.eclipse.emfforms.spi.common.sort;version="1.22.0",
- org.eclipse.emfforms.spi.common.validation;version="1.22.0"
+Export-Package: org.eclipse.emfforms.common;version="1.23.0",
+ org.eclipse.emfforms.internal.common;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.common.converter;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.common.report;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common;version="1.23.0",
+ org.eclipse.emfforms.spi.common.converter;version="1.23.0",
+ org.eclipse.emfforms.spi.common.locale;version="1.23.0",
+ org.eclipse.emfforms.spi.common.report;version="1.23.0",
+ org.eclipse.emfforms.spi.common.sort;version="1.23.0",
+ org.eclipse.emfforms.spi.common.validation;version="1.23.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.common/pom.xml b/bundles/org.eclipse.emfforms.common/pom.xml
index e8fbc51..da2a824 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF
index b3e6157..f6646db 100644
--- a/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.bazaar/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Bazaar
Bundle-SymbolicName: org.eclipse.emfforms.core.bazaar
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.bazaar;version="1.22.0",
- org.eclipse.emfforms.bazaar.internal;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.bazaar;version="1.22.0"
+Export-Package: org.eclipse.emfforms.bazaar;version="1.23.0",
+ org.eclipse.emfforms.bazaar.internal;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.bazaar;version="1.23.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.bazaar
Import-Package: javax.inject;version="1.0.0",
diff --git a/bundles/org.eclipse.emfforms.core.bazaar/pom.xml b/bundles/org.eclipse.emfforms.core.bazaar/pom.xml
index 47c650d..a9eb4cd 100644
--- a/bundles/org.eclipse.emfforms.core.bazaar/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.bazaar/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.bazaar</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 62ac8ae..8dc8c19 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Featurepath Databinding Services
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/featurePathDomainModelReferenceConverterService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.featurepath
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 29c9d18..0c18538 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/src/org/eclipse/emfforms/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter.java b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/src/org/eclipse/emfforms/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter.java
index 78d2d5d..39cb35f 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/src/org/eclipse/emfforms/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter.java
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/src/org/eclipse/emfforms/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,20 +10,26 @@
*
* Contributors:
* Lucas Koehler - initial API and implementation
+ * Christian W. Damus - bug 553224
******************************************************************************/
package org.eclipse.emfforms.core.services.databinding.featurepath;
import java.util.List;
+import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.databinding.IEMFListProperty;
import org.eclipse.emf.databinding.IEMFValueProperty;
import org.eclipse.emf.databinding.edit.EMFEditProperties;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.ENamedElement;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
import org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
@@ -58,7 +64,8 @@
}
if (!VFeaturePathDomainModelReference.class.isInstance(domainModelReference)) {
throw new IllegalArgumentException(
- "DomainModelReference must be an instance of VFeaturePathDomainModelReference."); //$NON-NLS-1$
+ String.format("DomainModelReference %1$s is not an instance of VFeaturePathDomainModelReference.", //$NON-NLS-1$
+ identify(domainModelReference)));
}
final VFeaturePathDomainModelReference featurePathReference = (VFeaturePathDomainModelReference) domainModelReference;
@@ -68,7 +75,15 @@
}
if (featurePathReference.getDomainModelEFeature().eIsProxy()) {
throw new DatabindingFailedException(
- "The field domainModelEFeature of the given VFeaturePathDomainModelReference must not be a proxy."); //$NON-NLS-1$
+ String.format("The domainModelEFeature %1$s of the given DMR %2$s is a proxy.", //$NON-NLS-1$
+ identify(featurePathReference.getDomainModelEFeature()), identify(featurePathReference)));
+ }
+ for (final EReference path : featurePathReference.getDomainModelEReferencePath()) {
+ if (path.eIsProxy()) {
+ throw new DatabindingFailedException(
+ String.format("The path reference %1$s of the given DMR %2$s is a proxy.", //$NON-NLS-1$
+ identify(path), identify(featurePathReference)));
+ }
}
return featurePathReference;
}
@@ -93,16 +108,16 @@
if (referencePath.get(0).isMany()) {
throw new DatabindingFailedException(String.format(
- "The path is not fully resolved. The reference being resolved is not a single reference [%1$s]. The DMR is %2$s.", //$NON-NLS-1$
- referencePath.get(0), domainModelReference));
+ "The path is not fully resolved. The reference being resolved is not a single reference: %1$s. The DMR is %2$s.", //$NON-NLS-1$
+ identify(referencePath.get(0)), identify(domainModelReference)));
}
IEMFValueProperty emfValueProperty = EMFEditProperties.value(editingDomain, referencePath.get(0));
for (int i = 1; i < referencePath.size(); i++) {
final EReference eReference = referencePath.get(i);
if (eReference.isMany()) {
throw new DatabindingFailedException(String.format(
- "The path is not fully resolved. The reference being resolved is not a single reference [%1$s]. The DMR is %2$s.", //$NON-NLS-1$
- eReference, domainModelReference));
+ "The path is not fully resolved. The reference being resolved is not a single reference: %1$s. The DMR is %2$s.", //$NON-NLS-1$
+ identify(eReference), identify(domainModelReference)));
}
emfValueProperty = emfValueProperty.value(eReference);
}
@@ -140,32 +155,105 @@
for (final EReference eReference : featurePathReference.getDomainModelEReferencePath()) {
if (eReference.isMany()) {
throw new DatabindingFailedException(String.format(
- "The path is not fully resolved. The reference being resolved is not a single reference [%1$s]. The DMR is %2$s. Last resolved EObject is %3$s.", //$NON-NLS-1$
- eReference, domainModelReference, currentObject));
+ "The path is not fully resolved. The reference being resolved is not a single reference: %1$s. The DMR is %2$s. Last resolved EObject is %3$s.", //$NON-NLS-1$
+ identify(eReference), identify(domainModelReference), identify(currentObject)));
}
if (currentObject.eClass().getFeatureID(eReference) == -1) {
throw new DatabindingFailedException(String.format(
- "Given EClass has no such feature. The DMR is %1$s. Last resolved EObject is %2$s. Reference being resolved is %3$s.", //$NON-NLS-1$
- domainModelReference, currentObject, eReference));
+ "Given EClass %1$s has no such feature %2$s. The DMR is %3$s. Last resolved EObject is %4$s.", //$NON-NLS-1$
+ identify(currentObject.eClass()), identify(eReference),
+ identify(domainModelReference), identify(currentObject)));
}
final EObject nextObject = (EObject) currentObject.eGet(eReference);
if (nextObject == null) {
throw new DatabindingFailedException(String.format(
"The path is not fully resolved. The DMR is %1$s. Last resolved EObject is %2$s. Reference being resolved is %3$s.", //$NON-NLS-1$
- domainModelReference, currentObject, eReference));
+ identify(domainModelReference), identify(currentObject), identify(eReference)));
}
currentObject = nextObject;
}
final EStructuralFeature structuralFeature = featurePathReference.getDomainModelEFeature();
if (structuralFeature.getEType() == null) {
throw new DatabindingFailedException(
- String.format("The eType of the feature %1$s is null.", structuralFeature.getName())); //$NON-NLS-1$
+ String.format("The eType of the feature %1$s is null in DMR %2$s.", identify(structuralFeature), //$NON-NLS-1$
+ identify(domainModelReference)));
}
if (currentObject.eClass().getEAllStructuralFeatures().contains(structuralFeature)) {
return InternalEObject.class.cast(currentObject).eSetting(structuralFeature);
}
- throw new DatabindingFailedException(String.format("The resolved Object %1$s doesn't contain the feature %2$s.", //$NON-NLS-1$
- currentObject.eClass().getName(), structuralFeature.getName()));
+ throw new DatabindingFailedException(String.format("The resolved EObject %1$s doesn't have the feature %2$s.", //$NON-NLS-1$
+ identify(currentObject), identify(structuralFeature)));
+ }
+
+ private static String identify(EObject eObject) {
+ if (eObject == null) {
+ return "<null>"; //$NON-NLS-1$
+ }
+
+ final StringBuilder result = new StringBuilder();
+
+ // First, a trimmed variant of the to-string representation (omit Java package)
+ result.append(eObject.toString());
+ final int hashCodePos = result.indexOf("@"); //$NON-NLS-1$
+ if (hashCodePos > 0) {
+ final int lastDotPos = result.lastIndexOf(".", hashCodePos); //$NON-NLS-1$
+ if (lastDotPos > 0) {
+ result.delete(0, lastDotPos + 1);
+ }
+ }
+
+ final Resource resource = eObject.eResource();
+ if (resource != null) {
+ result.append('<');
+ result.append(EcoreUtil.getURI(eObject));
+ result.append('>');
+ }
+
+ return result.toString();
+ }
+
+ private static String identify(ENamedElement element) {
+ if (element == null) {
+ return "<null>"; //$NON-NLS-1$
+ }
+
+ final StringBuilder result = new StringBuilder();
+
+ if (element.eIsProxy()) {
+ // Infer as much as possible
+ final URI proxyURI = EcoreUtil.getURI(element);
+
+ // Get the qualified ENamedElement name
+ String fragment = proxyURI.fragment();
+ while (!fragment.isEmpty() && fragment.charAt(0) == '/') {
+ fragment = fragment.substring(1);
+ }
+ result.append(fragment.replace('/', '.'));
+
+ // Get the package namespace (or Ecore path)
+ result.append(" ("); //$NON-NLS-1$
+ result.append(proxyURI.trimFragment());
+ result.append(')');
+ } else {
+ result.append(element.getName());
+
+ for (EObject container = element.eContainer(); container instanceof ENamedElement; container = container
+ .eContainer()) {
+
+ final ENamedElement parent = (ENamedElement) container;
+
+ if (parent instanceof EPackage) {
+ result.append(" ("); //$NON-NLS-1$
+ result.append(((EPackage) container).getNsURI());
+ result.append(')');
+ } else {
+ result.insert(0, '.');
+ result.insert(0, parent.getName());
+ }
+ }
+ }
+
+ return result.toString();
}
}
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 37a51ba..62d086b 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/indexDomainModelReferenceConverter.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.index
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 e83c2f5..deadea8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/.project b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/.project
index 1f10f0c..2083ec7 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/.project
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/.project
@@ -35,6 +35,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 4f24adb..81bc0a9 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: Keyattribute DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.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.8
Service-Component: OSGI-INF/KeyAttributeDomainModelReferenceConverter.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.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
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.keyattribute
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 a6fc913..50ef62b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 583afa8..b335907 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/mappingDomainModelReferenceConverter.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.mapping
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 3a0266d..a27b740 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF
index 174df7f..77edde0 100644
--- a/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.datatemplate/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms DataTemplate Service
Bundle-SymbolicName: org.eclipse.emfforms.core.services.datatemplate;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.datatemplate;version="1.22.0",
- org.eclipse.emfforms.internal.core.services.datatemplate;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.datatemplate;version="1.23.0",
+ org.eclipse.emfforms.internal.core.services.datatemplate;version="1.23.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.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/XmiTemplateProvider.xml,OSGI-INF/TemplateCreateNewModelElementStrategyProvider.xml,OSGI-INF/BlankTemplateProvider.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml b/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml
index a490df3..e2d403f 100644
--- a/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.datatemplate/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.datatemplate</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.datatemplate/src/org/eclipse/emfforms/internal/core/services/datatemplate/TemplateCreateNewModelElementStrategyProvider.java b/bundles/org.eclipse.emfforms.core.services.datatemplate/src/org/eclipse/emfforms/internal/core/services/datatemplate/TemplateCreateNewModelElementStrategyProvider.java
index 8ce1971..e536725 100644
--- a/bundles/org.eclipse.emfforms.core.services.datatemplate/src/org/eclipse/emfforms/internal/core/services/datatemplate/TemplateCreateNewModelElementStrategyProvider.java
+++ b/bundles/org.eclipse.emfforms.core.services.datatemplate/src/org/eclipse/emfforms/internal/core/services/datatemplate/TemplateCreateNewModelElementStrategyProvider.java
@@ -20,6 +20,7 @@
import java.util.LinkedHashSet;
import java.util.Objects;
import java.util.Set;
+import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -280,7 +281,8 @@
if (availableTemplates.size() > 1) {
// Don't show classes for which we don't have templates (bug 543461)
final Set<EClass> templateClasses = availableTemplates.stream()
- .map(Template::getInstance).filter(Objects::nonNull).map(EObject::eClass)
+ .map(Template::getInstance).filter(Objects::nonNull).map(ignoreException(EObject::eClass))
+ .filter(Objects::nonNull)
.collect(Collectors.toSet());
subClasses.retainAll(templateClasses);
@@ -317,4 +319,17 @@
return wizard.getSelectedTemplate();
}
}
+
+ // CHECKSTYLE.OFF: IllegalCatch
+ private static <T, R> Function<T, R> ignoreException(Function<T, R> function) {
+ return t -> {
+ try {
+ return function.apply(t);
+ } catch (final Exception e) {
+ // ignore
+ return null;
+ }
+ };
+ }
+ // CHECKSTYLE.ON: IllegalCatch
}
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/.project b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/.project
index 883c977..14f25a9 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/.project
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/.project
@@ -40,6 +40,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 f96f9fc..2083c1e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default Domain Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsDomainExpanderDefaultHeuristic.xml,OSGI-INF/EMFFormsDomainExpanderImpl.xml
Bundle-ActivationPolicy: lazy
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 7b4e4a7..7fabe91 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/.project b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/.project
index c86fd03..86a490f 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/.project
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/.project
@@ -40,6 +40,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 bfbbdd9..9f878a1 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsIndexDMRExpander.xml
Bundle-ActivationPolicy: lazy
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 8adba2d..39061ae 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/.project b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/.project
index dffa722..d90df10 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/.project
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/.project
@@ -35,6 +35,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 56b5856..702267d 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute DMR Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsKeyAttributeDMRExpander.xml
Bundle-ActivationPolicy: lazy
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 832909a..2806b78 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/.project b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/.project
index 5505a79..93d73b9 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/.project
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/.project
@@ -40,6 +40,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 f2dbe06..b57ab84 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsMappingDMRExpander.xml
Bundle-ActivationPolicy: lazy
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 8946c46..3843cfd 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/.project b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/.project
index 6225394..d7ea693 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/.project
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/.project
@@ -40,6 +40,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 629505f..3ac3a0a 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms TableControl Domain Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.table
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsTableDMRExpander.xml
Bundle-ActivationPolicy: lazy
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 df9952f..79c8c28 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6c9a126..e01c113 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,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Edit Support
Bundle-SymbolicName: org.eclipse.emfforms.core.services.editsupport
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.editsupport;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.editsupport;version="1.23.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/emfFormsEditSupport.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emfforms.core.services.editsupport
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml b/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
index f90eb50..49c43f9 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
@@ -15,7 +15,7 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emfforms</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<properties>
<jacoco.percentage.instruction>0.4</jacoco.percentage.instruction>
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 126306e..8bb63db 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services EMF
Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.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)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/emfLabelProvider.xml, OSGI-INF/emfLabelProviderDefault.xml, OSGI-INF/databindingService.xml
Bundle-ActivationPolicy: lazy
@@ -20,14 +20,14 @@
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.common;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.locale;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.6.0,2.0.0)",
org.osgi.service.component.annotations;version="1.3.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services.emf
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/pom.xml b/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
index e668ec5..3603729 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 55254d5..744e3c2 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms EMF Specific Service
Bundle-SymbolicName: org.eclipse.emfforms.core.services.emfspecificservice
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.23.0"
Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.emfspecificservice
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 4795b5a..0cc39d4 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/.project b/bundles/org.eclipse.emfforms.core.services.legacy/.project
index 56de683..4b14d05 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/.project
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
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 1b24eb2..6b4844e 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services Legacy
Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.model;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services.legacy
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
index 512b507..c5e79d3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1a0bb52..1febaf5 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Default Locale Provider
Bundle-SymbolicName: org.eclipse.emfforms.core.services.locale.default
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.22.0"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.23.0"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/defaultLocalizationService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emfforms.core.services.locale.default
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 70de8b2..0a4ae34 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/.project b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/.project
index 2b0240a..d3841b7 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/.project
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/.project
@@ -40,6 +40,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 989900d..289a08f 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Mapping Provider Default Heuristic
Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.default
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsMappingProviderDefaultHeuristic.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="0.0.0"
Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.default
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 3018542..0ad9a75 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF
index fb5f6d0..87e5a34 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Table Panel
Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.panel
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsMappingProviderTable.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.table.panel
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml
index 3a2d204..04bc068 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table.panel/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.panel</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/.project b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/.project
index cd614a3..e862ab2 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/.project
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/.project
@@ -40,6 +40,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 0bc8db4..ac43067 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Mapping Provider Table Control
Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsMappingProviderTable.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.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
Automatic-Module-Name: org.eclipse.emfforms.core.services.mappingprovider.table
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 19fc992..be433ef 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF
index 5c2472e..ef2e165 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/META-INF/MANIFEST.MF
@@ -2,21 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Core Services for Featurepath Segments
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.featurepath
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.22.0";x-friends:="org.eclipse.emfforms.core.services.segments.multi,org.eclipse.emfforms.core.services.segments.index"
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.23.0";x-friends:="org.eclipse.emfforms.core.services.segments.multi,org.eclipse.emfforms.core.services.segments.index"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/FeatureSegmentExpander.xml,
- OSGI-INF/FeatureSegmentConverter.xml,
- OSGI-INF/FeatureSegmentStructuralChangeTester.xml,
- OSGI-INF/FeaturePathDmrSegmentGenerator.xml,
- OSGI-INF/FeatureDmrToRootEClassConverter.xml
+Service-Component: OSGI-INF/FeatureSegmentExpander.xml,OSGI-INF/FeatureSegmentConverter.xml,OSGI-INF/FeatureSegmentStructuralChangeTester.xml,OSGI-INF/FeaturePathDmrSegmentGenerator.xml,OSGI-INF/FeatureDmrToRootEClassConverter.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.featurepath
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml
index c4b6ac4..3cbab85 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.featurepath/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF
index 57b18ea..99a2dfd 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.index/META-INF/MANIFEST.MF
@@ -2,27 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Core Services for Index Segments
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.index
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.index;version="1.22.0";x-friends:="org.eclipse.emfforms.core.services.databinding.index"
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.index;version="1.23.0";x-friends:="org.eclipse.emfforms.core.services.databinding.index"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/IndexSegmentConverter.xml,
- OSGI-INF/IndexSegmentExpander.xml,
- OSGI-INF/IndexSegmentStructuralChangeTester.xml,
- OSGI-INF/IndexDmrSegmentGenerator.xml,
- OSGI-INF/IndexDmrToRootEClassConverter.xml
+Service-Component: OSGI-INF/IndexSegmentConverter.xml,OSGI-INF/IndexSegmentExpander.xml,OSGI-INF/IndexSegmentStructuralChangeTester.xml,OSGI-INF/IndexDmrSegmentGenerator.xml,OSGI-INF/IndexDmrToRootEClassConverter.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.osgi.service.component.annotations;version="1.3.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.index
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml
index 3f431ab..525ef7e 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.index/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF
index cc6093a..cd5ff45 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.mapping/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Mapping Segment Services
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.mapping
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.22.0";x-friends:="org.eclipse.emfforms.core.services.databinding.mapping"
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.23.0";x-friends:="org.eclipse.emfforms.core.services.databinding.mapping"
Require-Bundle: org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/MappingSegmentConverter.xml,OSGI-INF/MappingSegmentExpander.xml,OSGI-INF/MappingSegmentStructuralChangeTester.xml,OSGI-INF/MappingDmrSegmentGenerator.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml
index b3407f7..88f3ecc 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.mapping/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF
index a7b72c8..d60ce09 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments.multi/META-INF/MANIFEST.MF
@@ -2,25 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Multi Segment Services
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.multi
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments.multi;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.segments.multi;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="3.13.0",
- org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/EMFFormsMappingProviderMulti.xml,
- OSGI-INF/MultiSegmentConverter.xml,
- OSGI-INF/MultiSegmentExpander.xml,
- OSGI-INF/TableDmrSegmentGenerator.xml,
- OSGI-INF/TableDmrToRootEClassConverter.xml
+Service-Component: OSGI-INF/EMFFormsMappingProviderMulti.xml,OSGI-INF/MultiSegmentConverter.xml,OSGI-INF/MultiSegmentExpander.xml,OSGI-INF/TableDmrSegmentGenerator.xml,OSGI-INF/TableDmrToRootEClassConverter.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.multi
diff --git a/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml
index 25d6a93..b94b284 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments.multi/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF
index 992a1ff..9bdb384 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.segments/META-INF/MANIFEST.MF
@@ -2,17 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Services for DMR Segments
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.segments;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.segments;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.segments;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.segments;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/SegmentGeneratorService.xml,
- OSGI-INF/DmrToSegmentsViewServiceFactory.xml,
- OSGI-INF/LegacyDmrToRootEClassImpl.xml
+Service-Component: OSGI-INF/SegmentGeneratorService.xml,OSGI-INF/DmrToSegmentsViewServiceFactory.xml,OSGI-INF/LegacyDmrToRootEClassImpl.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments
diff --git a/bundles/org.eclipse.emfforms.core.services.segments/pom.xml b/bundles/org.eclipse.emfforms.core.services.segments/pom.xml
index 311b3ee..32a1cbb 100644
--- a/bundles/org.eclipse.emfforms.core.services.segments/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.segments/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.segments</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/.project b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/.project
index 709450e..0986cb4 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/.project
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/.project
@@ -35,6 +35,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 d6c776c..0590f03 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Structural Change Tester Default Heuristic
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.default
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/StructuralChangeTesterDefault.xml
Bundle-ActivationPolicy: lazy
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 6509f9a..7c3222f 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/.project b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/.project
index 4172949..3c5ab10 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/.project
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
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 3988c62..bc05302 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms StructuralChange Index
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.index
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.index.StructuralChangeTesterIndex.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.23.0,1.24.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
Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.index
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 01f2b5e..5f5f873 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/.project b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/.project
index 53551df..1840351 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/.project
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/.project
@@ -35,6 +35,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 99bfada..4368b8b 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute Structural Change Tester
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/StructuralChangeTesterKeyAttribute.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.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
Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.keyattribute
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 49e4e4b..5f1612a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/.project b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/.project
index 8c4e9a2..75fd342 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/.project
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
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 120325e..e1d0c56 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms StructuralChange Mapping
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.mapping
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.mapping.StructuralChangeTesterMapping.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.23.0,1.24.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
Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.mapping
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 5621aaa..2e11b29 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/.project b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/.project
index b627716..5b473ba 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/.project
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/.project
@@ -40,6 +40,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 6447a9f..ced3afe 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Structural Change Tester Table
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.table
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/StructuralChangeTesterTable.xml
Bundle-ActivationPolicy: lazy
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 ce6de00..711e176 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/.project b/bundles/org.eclipse.emfforms.core.services.structuralchange/.project
index 144b2b4..b6e95ab 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/.project
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/.project
@@ -35,6 +35,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 93da6ed..f431c08 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,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Structural Change Tester
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
index 19c0b7f..7ea16d8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2988fc9..0ff056c 100644
--- a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
@@ -2,33 +2,30 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services
Bundle-SymbolicName: org.eclipse.emfforms.core.services
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.reveal;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.controlmapper;version="1.22.0",
- org.eclipse.emfforms.spi.core.services.databinding;version="1.22.0",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="1.22.0",
- org.eclipse.emfforms.spi.core.services.label;version="1.22.0",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.22.0",
- org.eclipse.emfforms.spi.core.services.reveal;version="1.22.0",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="1.22.0",
- org.eclipse.emfforms.spi.core.services.view;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.reveal;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="1.23.0",
+ org.eclipse.emfforms.spi.core.services.databinding;version="1.23.0",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="1.23.0",
+ org.eclipse.emfforms.spi.core.services.label;version="1.23.0",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.23.0",
+ org.eclipse.emfforms.spi.core.services.reveal;version="1.23.0",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="1.23.0",
+ org.eclipse.emfforms.spi.core.services.view;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-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,
- OSGI-INF/EMFFormsRevealServiceFactory.xml
+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,OSGI-INF/EMFFormsRevealServiceFactory.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="[1.0.0,2.0.0)",
org.eclipse.core.databinding.observable.list;version="0.0.0",
@@ -37,10 +34,10 @@
org.eclipse.core.databinding.property.value;version="0.0.0",
org.eclipse.e4.core.di;version="0.0.0",
org.eclipse.e4.core.di.suppliers;version="0.0.0",
- org.eclipse.emf.ecp.view.spi.model;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.8.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.core.services
diff --git a/bundles/org.eclipse.emfforms.core.services/pom.xml b/bundles/org.eclipse.emfforms.core.services/pom.xml
index acf90ed..e97aa2c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF
index 89937a9..dd7f320 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.datatemplate.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emfforms.datatemplate.provider.DatatemplateEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.datatemplate.provider;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.datatemplate.provider;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml b/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml
index 63f53cf..9c4f5d6 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.datatemplate.model.edit/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.datatemplate.model.edit</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model.edit/src/org/eclipse/emfforms/datatemplate/provider/DatatemplateEditPlugin.java b/bundles/org.eclipse.emfforms.datatemplate.model.edit/src/org/eclipse/emfforms/datatemplate/provider/DatatemplateEditPlugin.java
index 0e008c3..05561b6 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model.edit/src/org/eclipse/emfforms/datatemplate/provider/DatatemplateEditPlugin.java
+++ b/bundles/org.eclipse.emfforms.datatemplate.model.edit/src/org/eclipse/emfforms/datatemplate/provider/DatatemplateEditPlugin.java
@@ -15,7 +15,6 @@
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
/**
* This is the central singleton for the DataTemplate edit plugin.
@@ -52,7 +51,6 @@
*/
public DatatemplateEditPlugin() {
super(new ResourceLocator[] {
- EcoreEditPlugin.INSTANCE,
});
}
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF
index 350e210..f9188e0 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.datatemplate.model/META-INF/MANIFEST.MF
@@ -2,20 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.datatemplate;version="1.22.0";
- uses:="org.eclipse.emf.ecore,
- org.eclipse.emf.common.util",
- org.eclipse.emfforms.datatemplate.impl;version="1.22.0";
+Export-Package: org.eclipse.emfforms.datatemplate;version="1.23.0";uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
+ org.eclipse.emfforms.datatemplate.impl;version="1.23.0";x-internal:=true;
uses:="org.eclipse.emf.ecore,
org.eclipse.emf.ecore.impl,
org.eclipse.emf.common.util,
org.eclipse.emf.common.notify,
- org.eclipse.emfforms.datatemplate";x-internal:=true,
- org.eclipse.emfforms.datatemplate.util;version="1.22.0";
+ org.eclipse.emfforms.datatemplate",
+ org.eclipse.emfforms.datatemplate.util;version="1.23.0";
uses:="org.eclipse.emf.ecore,
org.eclipse.emf.common.notify,
org.eclipse.emf.common.notify.impl,
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.ecore b/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.ecore
index fd48b05..e320ce8 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.ecore
+++ b/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.ecore
@@ -5,8 +5,7 @@
<eClassifiers xsi:type="ecore:EClass" name="Template">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="instance" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
- containment="true"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TemplateCollection">
<eStructuralFeatures xsi:type="ecore:EReference" name="templates" upperBound="-1"
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.genmodel b/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.genmodel
index e2f85e2..f35b24c 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.genmodel
+++ b/bundles/org.eclipse.emfforms.datatemplate.model/model/datatemplate.genmodel
@@ -6,11 +6,10 @@
editorPluginClass="org.eclipse.emfforms.datatemplate.presentation.DatatemplateEditorPlugin"
nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
- copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
- operationReflection="true" importOrganizing="true" cleanup="true">
+ copyrightFields="false" operationReflection="true" importOrganizing="true" cleanup="true">
<foreignModel>datatemplate.ecore</foreignModel>
<genPackages prefix="DataTemplate" basePackage="org.eclipse.emfforms" disposableProviderFactory="true"
- extensibleProviderFactory="true" contentTypeIdentifier="org.eclipse.emfforms.datatemplate.model"
+ generateExampleClass="false" extensibleProviderFactory="true" contentTypeIdentifier="org.eclipse.emfforms.datatemplate.model"
ecorePackage="datatemplate.ecore#/">
<genClasses ecoreClass="datatemplate.ecore#//Template">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute datatemplate.ecore#//Template/name"/>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml b/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml
index 6449a18..61baf80 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.datatemplate.model/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.datatemplate.model</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.model/src/org/eclipse/emfforms/datatemplate/impl/DataTemplatePackageImpl.java b/bundles/org.eclipse.emfforms.datatemplate.model/src/org/eclipse/emfforms/datatemplate/impl/DataTemplatePackageImpl.java
index b2bd5e1..6fa15f9 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.model/src/org/eclipse/emfforms/datatemplate/impl/DataTemplatePackageImpl.java
+++ b/bundles/org.eclipse.emfforms.datatemplate.model/src/org/eclipse/emfforms/datatemplate/impl/DataTemplatePackageImpl.java
@@ -17,7 +17,6 @@
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.emfforms.datatemplate.DataTemplateFactory;
import org.eclipse.emfforms.datatemplate.DataTemplatePackage;
@@ -104,9 +103,6 @@
isInited = true;
- // Initialize simple dependencies
- EcorePackage.eINSTANCE.eClass();
-
// Create package meta-data objects
theDataTemplatePackage.createPackageContents();
@@ -245,10 +241,6 @@
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
@@ -260,9 +252,9 @@
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getTemplate_Name(), ecorePackage.getEString(), "name", null, 0, 1, Template.class, !IS_TRANSIENT, //$NON-NLS-1$
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getTemplate_Instance(), theEcorePackage.getEObject(), null, "instance", null, 1, 1, //$NON-NLS-1$
- Template.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTemplate_Instance(), ecorePackage.getEObject(), null, "instance", null, 1, 1, Template.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEClass(templateCollectionEClass, TemplateCollection.class, "TemplateCollection", !IS_ABSTRACT, //$NON-NLS-1$
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF
index 443eb32..799cc14 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/META-INF/MANIFEST.MF
@@ -2,42 +2,42 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms DataTemplate Tooling
Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.tooling;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.13.1,4.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.TemplateInstanceRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEClassSelectionStrategyProvider.xml
+Service-Component: OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.TemplateInstanceRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEClassSelectionStrategyProvider.xml,OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEObjectSelectionStrategyProvider.xml,OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateCreateNewModelElementStrategyProvider.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.ui.view.swt.reference;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.editor;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt.reference;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.editor;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="1.3.0"
Automatic-Module-Name: org.eclipse.emfforms.datatemplate.tooling
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateCreateNewModelElementStrategyProvider.xml b/bundles/org.eclipse.emfforms.datatemplate.tooling/OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateCreateNewModelElementStrategyProvider.xml
new file mode 100644
index 0000000..d0c6921
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateCreateNewModelElementStrategyProvider.xml
@@ -0,0 +1,8 @@
+<?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.datatemplate.tooling.editor.DataTemplateCreateNewModelElementStrategyProvider">
+ <property name="service.ranking" type="Integer" value="20"/>
+ <service>
+ <provide interface="org.eclipse.emf.ecp.ui.view.swt.reference.CreateNewModelElementStrategy$Provider"/>
+ </service>
+ <implementation class="org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateCreateNewModelElementStrategyProvider"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEObjectSelectionStrategyProvider.xml b/bundles/org.eclipse.emfforms.datatemplate.tooling/OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEObjectSelectionStrategyProvider.xml
new file mode 100644
index 0000000..099d127
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/OSGI-INF/org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEObjectSelectionStrategyProvider.xml
@@ -0,0 +1,8 @@
+<?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.datatemplate.tooling.editor.DataTemplateEObjectSelectionStrategyProvider">
+ <property name="service.ranking" type="Integer" value="5"/>
+ <service>
+ <provide interface="org.eclipse.emf.ecp.ui.view.swt.reference.EObjectSelectionStrategy$Provider"/>
+ </service>
+ <implementation class="org.eclipse.emfforms.internal.datatemplate.tooling.editor.DataTemplateEObjectSelectionStrategyProvider"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml b/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml
index 6aab6d9..2f56b32 100644
--- a/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.datatemplate.tooling</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/DataTemplateCreateNewModelElementStrategyProvider.java b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/DataTemplateCreateNewModelElementStrategyProvider.java
new file mode 100644
index 0000000..eb7d4cc
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/DataTemplateCreateNewModelElementStrategyProvider.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.datatemplate.tooling.editor;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.ui.view.swt.reference.CreateNewModelElementStrategy;
+import org.eclipse.emf.ecp.ui.view.swt.reference.CreateNewModelElementStrategy.Provider;
+import org.eclipse.emf.ecp.ui.view.swt.reference.ReferenceServiceCustomizationVendor;
+import org.eclipse.emfforms.bazaar.Create;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.emfforms.datatemplate.Template;
+import org.eclipse.emfforms.datatemplate.TemplateCollection;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * Provides a strategy to the DefaultReferenceService
+ * that does not allow to create objects in non containment references inside data templates.
+ *
+ * @author Eugen Neufeld
+ * @since 1.23
+ */
+@Component(property = "service.ranking:Integer=20")
+public class DataTemplateCreateNewModelElementStrategyProvider
+ extends ReferenceServiceCustomizationVendor<CreateNewModelElementStrategy> implements Provider {
+
+ @Override
+ protected boolean handles(EObject owner, EReference reference) {
+ return !(owner instanceof Template) && !reference.isContainment()
+ && EcoreUtil.getRootContainer(owner) instanceof TemplateCollection;
+ }
+
+ /**
+ * Creates the {@link CreateNewModelElementStrategy}.
+ *
+ * @return The created {@link CreateNewModelElementStrategy}
+ */
+ @Create
+ public CreateNewModelElementStrategy createCreateNewModelElementStrategy() {
+ return new Strategy();
+ }
+
+ /**
+ * The actual {@link CreateNewModelElementStrategy strategy} that informes the user, that a new object cannot be
+ * created in a non containment references in a data template.
+ *
+ * @author Eugen Neufeld
+ */
+ class Strategy implements CreateNewModelElementStrategy {
+
+ @Override
+ public Optional<EObject> createNewModelElement(EObject owner, EReference reference) {
+ MessageDialog.openInformation(Display.getDefault().getActiveShell(),
+ Messages.DataTemplateCreateNewModelElement_0,
+ Messages.DataTemplateCreateNewModelElement_1);
+ return Optional.empty();
+ }
+
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/DataTemplateEObjectSelectionStrategyProvider.java b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/DataTemplateEObjectSelectionStrategyProvider.java
new file mode 100644
index 0000000..ac496f2
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/DataTemplateEObjectSelectionStrategyProvider.java
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ * Christian W. Damus - bug 550799
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.datatemplate.tooling.editor;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.ui.view.swt.reference.EObjectSelectionStrategy;
+import org.eclipse.emf.ecp.ui.view.swt.reference.ReferenceServiceCustomizationVendor;
+import org.eclipse.emfforms.bazaar.Create;
+import org.eclipse.emfforms.datatemplate.Template;
+import org.eclipse.emfforms.datatemplate.TemplateCollection;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * Provider of an data template specific object selection strategy.
+ * The objects which are allowed to be selected must be from the same template as the object we want to add them to.
+ *
+ * @author Eugen Neufeld
+ * @since 1.23
+ */
+@Component(property = "service.ranking:Integer=5")
+public class DataTemplateEObjectSelectionStrategyProvider
+ extends ReferenceServiceCustomizationVendor<EObjectSelectionStrategy>
+ implements EObjectSelectionStrategy.Provider {
+
+ /**
+ * Initializes me.
+ */
+ public DataTemplateEObjectSelectionStrategyProvider() {
+ super();
+ }
+
+ @Override
+ protected boolean handles(EObject owner, EReference reference) {
+ return EcoreUtil.getRootContainer(owner) instanceof TemplateCollection;
+ }
+
+ /**
+ * Create the selection strategy.
+ *
+ * @return the selection strategy
+ */
+ @Create
+ public EObjectSelectionStrategy createEObjectSelectionStrategy() {
+ return new Strategy();
+ }
+
+ //
+ // Nested types
+ //
+
+ /**
+ * The selection strategy.
+ */
+ private static class Strategy implements EObjectSelectionStrategy {
+ /**
+ * Initializes me.
+ */
+ Strategy() {
+ super();
+ }
+
+ @Override
+ public Collection<EObject> collectExistingObjects(EObject owner, EReference reference,
+ Collection<EObject> existingObjects) {
+ final EObject template = getEnclosingTemplate(owner);
+ return existingObjects.stream().filter(o -> EcoreUtil.isAncestor(template,
+ o)).collect(Collectors.toList());
+ }
+
+ private EObject getEnclosingTemplate(EObject eObject) {
+ EObject result = eObject;
+ while (result != null && !(result instanceof Template)) {
+ result = result.eContainer();
+ }
+ return result;
+ }
+
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/Messages.java b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/Messages.java
new file mode 100644
index 0000000..ba43e24
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/Messages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * eugen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.datatemplate.tooling.editor;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * @author Eugen Neufeld
+ * @generated
+ */
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.emfforms.internal.datatemplate.tooling.editor.messages"; //$NON-NLS-1$
+ public static String DataTemplateCreateNewModelElement_0;
+ public static String DataTemplateCreateNewModelElement_1;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/messages.properties b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/messages.properties
new file mode 100644
index 0000000..6e48c9b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.datatemplate.tooling/src/org/eclipse/emfforms/internal/datatemplate/tooling/editor/messages.properties
@@ -0,0 +1,2 @@
+DataTemplateCreateNewModelElement_0=Cannot create element
+DataTemplateCreateNewModelElement_1=Cannot add new objects to non-containment references in a template.
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/.project b/bundles/org.eclipse.emfforms.editor.ecore/.project
index 21e7e7c..b6748e1 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/.project
+++ b/bundles/org.eclipse.emfforms.editor.ecore/.project
@@ -35,6 +35,5 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 4406ab2..49ab03d 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
@@ -2,55 +2,47 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ecore Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.actions;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.controls;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.actions;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,
- OSGI-INF/dataTypeControlService.xml,
- OSGI-INF/eenumLiteralControlService.xml,
- OSGI-INF/typedElementBoundsControlService.xml,
- OSGI-INF/ecoreAttachmentStrategyProvider.xml,
- OSGI-INF/ecoreEObjectSelectionStrategyProvider.xml,
- OSGI-INF/ecoreOpenInNewContextStrategyProvider.xml,
- OSGI-INF/ecoreReferenceStrategyProvider.xml,
- OSGI-INF/typedElementBoundsRevealProvider.xml
+Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,OSGI-INF/dataTypeControlService.xml,OSGI-INF/eenumLiteralControlService.xml,OSGI-INF/typedElementBoundsControlService.xml,OSGI-INF/ecoreAttachmentStrategyProvider.xml,OSGI-INF/ecoreEObjectSelectionStrategyProvider.xml,OSGI-INF/ecoreOpenInNewContextStrategyProvider.xml,OSGI-INF/ecoreReferenceStrategyProvider.xml,OSGI-INF/typedElementBoundsRevealProvider.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)";resolution:=optional,
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)";resolution:=optional,
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.editor.ecore
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
index 79c7182..9dcdbfd 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f3b2a53..047a50c 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
@@ -365,11 +365,10 @@
return;
}
- validationIcon.setImage(getValidationIcon(getVElement().getDiagnostic().getHighestSeverity()));
+ validationIcon.setImage(getValidationIcon());
validationIcon.setToolTipText(getVElement().getDiagnostic().getMessage());
- setValidationColor(editControl, getValidationBackgroundColor(getVElement().getDiagnostic()
- .getHighestSeverity()));
+ setValidationColor(editControl, getValidationBackgroundColor());
}
/**
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 e5092ce..4b87d1c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Genmodel Editor Utilities
Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel.util;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.23.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 6ad64c7..6a10092 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 71d4cfc..bd27db0 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: GenModel Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
- org.eclipse.emfforms.internal.editor.genmodel.service;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.23.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
+ org.eclipse.emfforms.internal.editor.genmodel.service;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.runtime;version="3.4.0"
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
index 76e5bf3..8e51ea0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 a70be81..a1771c4 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewModel Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.viewmodel;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
+Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.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.8
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
index dad429f..c196d47 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 54b2ce5..3b88e2a 100644
--- a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
@@ -2,36 +2,36 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emfforms.internal.editor.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.handlers;version="1.22.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.editor.toolbaractions;version="1.22.0";;x-internal:=true;x-internal:=true,
- org.eclipse.emfforms.internal.editor.ui;version="1.22.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.spi.editor;version="1.22.0",
- org.eclipse.emfforms.spi.editor.handler;version="1.22.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.22.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel",
- org.eclipse.emfforms.spi.editor.messages;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.editor;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.handlers;version="1.23.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.editor.toolbaractions;version="1.23.0";;x-internal:=true;x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ui;version="1.23.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.spi.editor;version="1.23.0",
+ org.eclipse.emfforms.spi.editor.handler;version="1.23.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.23.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel",
+ org.eclipse.emfforms.spi.editor.messages;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emfforms.editor
diff --git a/bundles/org.eclipse.emfforms.editor/pom.xml b/bundles/org.eclipse.emfforms.editor/pom.xml
index d0acd81..6f95000 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF
index c771150..d4c28ce 100644
--- a/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.builder/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emfforms.ide.builder;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emfforms.ide.internal.builder.Activator
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.builder;version="1.22.0",
- org.eclipse.emfforms.ide.internal.builder;version="1.22.0";x-friends:="org.eclipse.emfforms.ide.builder.test",
- org.eclipse.emfforms.ide.internal.builder.messages;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.builder;version="1.23.0",
+ org.eclipse.emfforms.ide.internal.builder;version="1.23.0";x-friends:="org.eclipse.emfforms.ide.builder.test",
+ org.eclipse.emfforms.ide.internal.builder.messages;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
@@ -15,12 +15,12 @@
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.13.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)"
Import-Package: org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.ide.builder
Service-Component: OSGI-INF/org.eclipse.emfforms.ide.internal.builder.ViewModelValidationDelegate$Provider.xml,OSGI-INF/org.eclipse.emfforms.ide.internal.builder.ViewModelMarkerHelper$Provider.xml
diff --git a/bundles/org.eclipse.emfforms.ide.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.builder/pom.xml
index e691cbc..6da0855 100644
--- a/bundles/org.eclipse.emfforms.ide.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.builder/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.builder</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.builder/src/org/eclipse/emfforms/ide/internal/builder/ViewModelValidationDelegate.java b/bundles/org.eclipse.emfforms.ide.builder/src/org/eclipse/emfforms/ide/internal/builder/ViewModelValidationDelegate.java
index 6172c51..5ce72e3 100644
--- a/bundles/org.eclipse.emfforms.ide.builder/src/org/eclipse/emfforms/ide/internal/builder/ViewModelValidationDelegate.java
+++ b/bundles/org.eclipse.emfforms.ide.builder/src/org/eclipse/emfforms/ide/internal/builder/ViewModelValidationDelegate.java
@@ -20,7 +20,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -32,12 +31,9 @@
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.model.util.ViewModelPropertiesHelper;
-import org.eclipse.emf.ecp.view.spi.model.util.ViewValidator;
import org.eclipse.emfforms.bazaar.Bid;
import org.eclipse.emfforms.bazaar.Create;
-import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.common.spi.validation.ValidationService;
-import org.eclipse.emfforms.common.spi.validation.filter.AbstractComplexFilter;
import org.eclipse.emfforms.ide.builder.ValidationDelegate;
import org.eclipse.emfforms.ide.builder.ValidationDelegateProvider;
import org.eclipse.emfforms.ide.builder.ValidationServiceDelegate;
@@ -97,23 +93,11 @@
final VViewModelProperties properties = ViewModelPropertiesHelper.getInhertitedPropertiesOrEmpty(view);
view.setLoadingProperties(properties);
- validationService.registerValidationFilter(new ViewValidatorDuplicateFilter());
+ validationService.addObjectFilter(this::skipValidation);
}
- /**
- * Filter to avoid duplications in validation from {@link ViewValidator}.
- */
- private class ViewValidatorDuplicateFilter extends AbstractComplexFilter {
- @Override
- public boolean skipSubtree(EObject eObject, Optional<Diagnostic> diagnostic) {
- return false;
- }
-
- @Override
- public boolean skipValidation(EObject eObject) {
- return VDomainModelReference.class.isInstance(eObject);
- }
-
+ private boolean skipValidation(EObject eObject) {
+ return VDomainModelReference.class.isInstance(eObject);
}
//
diff --git a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF
index c948430..92b453c 100644
--- a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emfforms.ide.datatemplate.builder;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.datatemplate.internal.builder;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.datatemplate.internal.builder;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.datatemplate.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.datatemplate.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.ide.datatemplate.internal.builder.DataTemplateValidationDelegateProvider.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml
index 54702a5..dc5945e 100644
--- a/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.datatemplate.builder/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.datatemplate.builder</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF
index 526f1a5..1a6e018 100644
--- a/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.ecore.builder/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emfforms.ide.ecore.builder;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.ecore.internal.builder;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.ecore.internal.builder;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.ide.ecore.internal.builder.EcoreValidationDelegateProvider.xml
diff --git a/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml
index 2f6ee6e..c095c54 100644
--- a/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.ecore.builder/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.ecore.builder</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF
index da85976..a80bbc4 100644
--- a/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.preferences/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Preferences
Bundle-SymbolicName: org.eclipse.emfforms.ide.preferences;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Automatic-Module-Name: org.eclipse.emfforms.ide.preferences
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.emfforms.internal.ide.preferences;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.ide.preferences;version="1.23.0"
Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.equinox.preferences;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.ide.preferences;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.ide.preferences;version="1.22.0"
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.emfforms.ide.preferences
diff --git a/bundles/org.eclipse.emfforms.ide.preferences/pom.xml b/bundles/org.eclipse.emfforms.ide.preferences/pom.xml
index d724320..039b03c 100644
--- a/bundles/org.eclipse.emfforms.ide.preferences/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.preferences/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.preferences</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF
index e7cdf53..b396e25 100644
--- a/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.indexsegment/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Index Segment IDE Tooling
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.indexsegment;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.ide.view.indexsegment;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.ide.view.indexsegment;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/IndexSegmentIdeDescriptor.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml b/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml
index c98a85d..cbc7b1c 100644
--- a/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.indexsegment/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.ide.view.indexsegment</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF
index 6657c2d..8b0c573 100644
--- a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Mapping Segment IDE Tooling
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.mappingsegment;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/MappingSegmentIdeDescriptor.xml,OSGI-INF/MappedEClassControlSWTRendererTester.xml
diff --git a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml
index f0029c5..b447754 100644
--- a/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.mappingsegment/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
index 2f8c88f..fcdf08f 100644
--- a/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.multisegment/META-INF/MANIFEST.MF
@@ -2,41 +2,36 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Multi Segment IDE Tooling
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.ide.view.segments;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.ide.view.segments;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Service-Component: OSGI-INF/MultiSegmentChildDmrOpenInNewContextStrategyProvider.xml,
- OSGI-INF/MultiDmrNewReferenceElementStrategyProvider.xml,
- OSGI-INF/MultiSegmentIdeDescriptor.xml,
- OSGI-INF/MultiSegmentChildDmrNewModelElementStrategyProvider.xml,
- OSGI-INF/MultiDmrOpenInNewContextStrategyProvider.xml,
- OSGI-INF/MultiSegmentChildDmrsSWTRendererService.xml
+Service-Component: OSGI-INF/MultiSegmentChildDmrOpenInNewContextStrategyProvider.xml,OSGI-INF/MultiDmrNewReferenceElementStrategyProvider.xml,OSGI-INF/MultiSegmentIdeDescriptor.xml,OSGI-INF/MultiSegmentChildDmrNewModelElementStrategyProvider.xml,OSGI-INF/MultiDmrOpenInNewContextStrategyProvider.xml,OSGI-INF/MultiSegmentChildDmrsSWTRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="0.0.0",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml b/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml
index bf7f7d0..89f9b9d 100644
--- a/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.multisegment/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.ide.view.multisegment</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF
index aeb612a..0ed02bc 100644
--- a/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.view.segments/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Segments IDE Tooling
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.segments
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Automatic-Module-Name: org.eclipse.emfforms.ide.view.segments
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.ide.view.segments;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)",
org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.ide.preferences;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.ide.view.segments;version="1.22.0"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.ide.preferences;bundle-version="[1.23.0,1.24.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Service-Component: OSGI-INF/org.eclipse.emfforms.internal.ide.view.segments.DmrToSegmentsMigratorImpl.xml
+Bundle-ActivationPolicy: lazy
Import-Package: org.osgi.framework;version="1.2.0",
org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
-Service-Component: OSGI-INF/org.eclipse.emfforms.internal.ide.view.segments.DmrToSegmentsMigratorImpl.xml
+Automatic-Module-Name: org.eclipse.emfforms.ide.view.segments
diff --git a/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml b/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml
index 1ec416a..697840c 100644
--- a/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.view.segments/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.view.segments</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF
index 6650d22..46e9f0d 100644
--- a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emfforms.ide.viewtemplate.builder;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.emfforms.ide.viewtemplate.internal.builder;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.viewtemplate.internal.builder;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.ide.viewtemplate.internal.builder.ViewTemplateValidationDelegateProvider.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml
index 9cb0712..8083ca8 100644
--- a/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml
+++ b/bundles/org.eclipse.emfforms.ide.viewtemplate.builder/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.viewtemplate.builder</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.localization/.project b/bundles/org.eclipse.emfforms.localization/.project
index d892854..bd63417 100644
--- a/bundles/org.eclipse.emfforms.localization/.project
+++ b/bundles/org.eclipse.emfforms.localization/.project
@@ -40,7 +40,6 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
index ae1793b..3e1d5fe 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Localization
Bundle-SymbolicName: org.eclipse.emfforms.localization
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.localization;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.localization;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.23.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.localization
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.22.0]",
- org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.22.0]",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.23.0]",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.23.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 f329689..896544c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 040b7e9..fb2d1a2 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,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emfforms.rulerepository.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
index b1219b6..d8f9b27 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 5066f2b..32c0c79 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.22.0",
- org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.22.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
- org.eclipse.emfforms.spi.rulerepository.model.util;version="1.22.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.23.0",
+ org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.23.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
+ org.eclipse.emfforms.spi.rulerepository.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emfforms.rulerepository.model
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
index b517bf5..ab95f6f 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.project b/bundles/org.eclipse.emfforms.rulerepository.tooling/.project
index f82f29e..445cec3 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/.project
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.project
@@ -34,7 +34,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
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 fa24ad3..9613658 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms RuleRepository Tooling
Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.23.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,21 +14,21 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.rulerepository.tooling
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
index 18686ea..d4e101d 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 5074c79..8cb0c20 100644
--- a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
@@ -2,46 +2,46 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Base Dependencies
Bundle-SymbolicName: org.eclipse.emfforms.setup.base
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.23.0,1.24.0)"
diff --git a/bundles/org.eclipse.emfforms.setup.base/pom.xml b/bundles/org.eclipse.emfforms.setup.base/pom.xml
index 1c9f5d4..1681f2d 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/.project b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/.project
index 5c0ff1d..28e7b45 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/.project
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/.project
@@ -34,7 +34,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
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 0f3f16d..c7701c6 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Categorization renderer using an Expandbar
Bundle-SymbolicName: org.eclipse.emfforms.swt.categorization.expandbar
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.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)",
@@ -18,13 +18,13 @@
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.categorization.expandbar.CategorizationElementExpandBarRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.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 2f5ad40..e7f5b1c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java
index 934b9df..5645081 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/src/org/eclipse/emfforms/internal/swt/categorization/expandbar/ExpandBarCategorizationElementRenderer.java
@@ -26,7 +26,7 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.databinding.EMFDataBindingContext;
import org.eclipse.emf.databinding.edit.EMFEditObservables;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
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.VCategorization;
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/.project b/bundles/org.eclipse.emfforms.swt.control.multiattribute/.project
index f15f6e9..20fcfab 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/.project
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 dc030ff..d16fbd8 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,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Renderer for Multi EAttributes
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.multiattribute;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.control.multiattribute;version="1.22.0",
- org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.control.multiattribute;version="1.23.0",
+ org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/MultiAttributeRendererService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml b/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
index 17e38b5..62af42b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 28d2ee7..4296c3a 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
@@ -717,7 +717,7 @@
if (getVElement().getDiagnostic() == null) {
return;
}
- validationIcon.setImage(getValidationIcon(getVElement().getDiagnostic().getHighestSeverity()));
+ validationIcon.setImage(getValidationIcon());
validationIcon.setToolTipText(ECPTooltipModifierHelper.modifyString(getVElement().getDiagnostic()
.getMessage(), null));
}
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/.project b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/.project
index b531976..8907224 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/.project
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 60f7b79..3118208 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,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Text Control with Autocomplete
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer.AutocompleteTextControlSWTRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.fieldassist;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 4ec3591..dcc7174 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.project b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.project
index 63d4415..67482ac 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.project
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 0419ea7..1ff53df 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Rich Text Control
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.richtext;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.102.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)"
@@ -24,7 +24,7 @@
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
org.osgi.framework;version="0.0.0",
org.osgi.service.component.annotations;version="0.0.0";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.swt.control.text.richtext
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 a41eb3a..5d806fa 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.controlgrid/.project b/bundles/org.eclipse.emfforms.swt.controlgrid/.project
index 982efff..f662661 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/.project
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/.project
@@ -40,7 +40,6 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
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 3d325af..1eb9df2 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Control Grid SWT Renderer
Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.22.0"
-Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.23.0"
+Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/ControlGridSWTRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.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/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml b/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
index ce53630..82ae847 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c05f911..d6bccd0 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: SWT Core DI Extension
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.core.di.extension
Service-Component: OSGI-INF/emfFormsDIExtensionRendererFactory.xml
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 9ba17b0..c6c5059 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0c6f317..d014878 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,26 +2,24 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core DI
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core.di;version="1.22.0"
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core.di;version="1.23.0"
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.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.8
-Service-Component: OSGI-INF/emfFormsDIRendererFactory.xml,
- OSGI-INF/e4ContextViewServiceFactory.xml,
- OSGI-INF/rendererSupplier.xml
+Service-Component: OSGI-INF/emfFormsDIRendererFactory.xml,OSGI-INF/e4ContextViewServiceFactory.xml,OSGI-INF/rendererSupplier.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.common.di;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.common.di;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.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
Automatic-Module-Name: org.eclipse.emfforms.swt.core.di
diff --git a/bundles/org.eclipse.emfforms.swt.core.di/pom.xml b/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
index 574c987..c5494bb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/.project b/bundles/org.eclipse.emfforms.swt.core.plugin/.project
index b94c37d..f5f4bc5 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/.project
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/.project
@@ -41,6 +41,5 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
</natures>
</projectDescription>
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 e4c99a8..9daba69 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core Plugin
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.plugin
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.swt.core.plugin
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml b/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
index 5d356f3..2fd7ccd 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.core/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.swt.core/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..73a356b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,8 @@
+classpath=true
+dsVersion=V1_3
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
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 76ff19f..c03698f 100644
--- a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
@@ -2,31 +2,35 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core
Bundle-SymbolicName: org.eclipse.emfforms.swt.core
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.22.0",
- org.eclipse.emfforms.spi.swt.core.data;version="1.22.0",
- org.eclipse.emfforms.spi.swt.core.layout;version="1.22.0",
- org.eclipse.emfforms.spi.swt.core.ui;version="1.22.0",
- org.eclipse.emfforms.spi.swt.core.util;version="1.22.0",
- org.eclipse.emfforms.swt.core;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.ui;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.core.data;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.core.layout;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.core.ui;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.core.util;version="1.23.0",
+ org.eclipse.emfforms.swt.core;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/rendererFactory.xml,
OSGI-INF/containerRevealProvider.xml,
- OSGI-INF/controlRevealProvider.xml
+ OSGI-INF/controlRevealProvider.xml,
+ OSGI-INF/org.eclipse.emfforms.internal.swt.core.ui.SWTValidationUiServiceImpl.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="1.22.0",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
org.eclipse.jface.layout;version="0.0.0",
+ org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.custom;version="0.0.0",
@@ -36,3 +40,4 @@
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Automatic-Module-Name: org.eclipse.emfforms.swt.core
+Bundle-Activator: org.eclipse.emfforms.internal.swt.core.Activator
diff --git a/bundles/org.eclipse.emfforms.swt.core/OSGI-INF/org.eclipse.emfforms.internal.swt.core.ui.SWTValidationUiServiceImpl.xml b/bundles/org.eclipse.emfforms.swt.core/OSGI-INF/org.eclipse.emfforms.internal.swt.core.ui.SWTValidationUiServiceImpl.xml
new file mode 100644
index 0000000..cddf3e5
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/OSGI-INF/org.eclipse.emfforms.internal.swt.core.ui.SWTValidationUiServiceImpl.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" name="org.eclipse.emfforms.internal.swt.core.ui.SWTValidationUiServiceImpl">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService"/>
+ </service>
+ <implementation class="org.eclipse.emfforms.internal.swt.core.ui.SWTValidationUiServiceImpl"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.swt.core/build.properties b/bundles/org.eclipse.emfforms.swt.core/build.properties
index 6907575..e93b71f 100644
--- a/bundles/org.eclipse.emfforms.swt.core/build.properties
+++ b/bundles/org.eclipse.emfforms.swt.core/build.properties
@@ -2,6 +2,7 @@
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
- about.html
+ about.html,\
+ icons/
source.. = src/
src.includes = about.html
diff --git a/bundles/org.eclipse.emfforms.swt.core/icons/error_decorate.png b/bundles/org.eclipse.emfforms.swt.core/icons/error_decorate.png
new file mode 100644
index 0000000..28847c4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/icons/error_decorate.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.swt.core/icons/info_decorate.gif b/bundles/org.eclipse.emfforms.swt.core/icons/info_decorate.gif
new file mode 100644
index 0000000..d485366
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/icons/info_decorate.gif
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.swt.core/icons/validation_error.png b/bundles/org.eclipse.emfforms.swt.core/icons/validation_error.png
new file mode 100644
index 0000000..fd79d15
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/icons/validation_error.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.swt.core/icons/validation_warning.png b/bundles/org.eclipse.emfforms.swt.core/icons/validation_warning.png
new file mode 100644
index 0000000..628cf2d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/icons/validation_warning.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.swt.core/icons/warning_decorate.png b/bundles/org.eclipse.emfforms.swt.core/icons/warning_decorate.png
new file mode 100644
index 0000000..14caf6c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/icons/warning_decorate.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.swt.core/pom.xml b/bundles/org.eclipse.emfforms.swt.core/pom.xml
index a976a97..54e4180 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/Activator.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/Activator.java
new file mode 100644
index 0000000..a24553d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/Activator.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Lucas Koehler - initial API and implementation
+ *
+ *******************************************************************************/
+package org.eclipse.emfforms.internal.swt.core;
+
+import java.net.URL;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * The activator class controls the plug-in life cycle.
+ */
+public class Activator extends Plugin {
+ private static final String NULL = "NULL"; //$NON-NLS-1$
+
+ /** The plug-in ID. **/
+ public static final String PLUGIN_ID = "org.eclipse.emfforms.swt.core"; //$NON-NLS-1$
+
+ /** The shared instance. **/
+ private static Activator plugin;
+
+ /**
+ * The constructor.
+ */
+ public Activator() {
+ }
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ imageRegistry.values().forEach(Image::dispose);
+ if (viewTemplateReference != null) {
+ context.ungetService(viewTemplateReference);
+ }
+ super.stop(context);
+ plugin = null;
+ }
+
+ /**
+ * Returns the shared instance.
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ private final Map<String, Image> imageRegistry = new LinkedHashMap<String, Image>(20, .8F, true) {
+ private static final long serialVersionUID = 1L;
+
+ // This method is called just after a new entry has been added
+ @Override
+ public boolean removeEldestEntry(Map.Entry<String, Image> eldest) {
+ return size() > 20;
+ }
+
+ @Override
+ public Image remove(Object arg0) {
+ final Image image = super.remove(arg0);
+ image.dispose();
+ return image;
+ }
+
+ };
+
+ /**
+ * Loads an image based on the provided {@link URL} form this bundle. The url may be null, then an empty image is
+ * returned.
+ *
+ * @param url the {@link URL} to load the {@link Image} from
+ * @return the {@link Image}
+ */
+ public static Image getImage(URL url) {
+ if (!getDefault().imageRegistry.containsKey(url == null ? NULL : url.toExternalForm())) {
+ final ImageDescriptor createFromURL = ImageDescriptor.createFromURL(url);
+ getDefault().imageRegistry.put(url == null ? NULL : url.toExternalForm(), createFromURL.createImage());
+ }
+ return getDefault().imageRegistry.get(url == null ? NULL : url.toExternalForm());
+
+ }
+
+ private ServiceReference<VTViewTemplateProvider> viewTemplateReference;
+
+ /**
+ * Returns the currentInstance of the {@link VTViewTemplateProvider}.
+ *
+ * @return the {@link VTViewTemplateProvider}
+ */
+ public VTViewTemplateProvider getVTViewTemplateProvider() {
+ if (viewTemplateReference == null) {
+ viewTemplateReference = plugin.getBundle().getBundleContext()
+ .getServiceReference(VTViewTemplateProvider.class);
+ }
+ if (viewTemplateReference != null) {
+ return plugin.getBundle().getBundleContext().getService(viewTemplateReference);
+ }
+ return null;
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/ControlRevealProvider.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/ControlRevealProvider.java
index 6fe0c20..b67a936 100644
--- a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/ControlRevealProvider.java
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/ControlRevealProvider.java
@@ -17,8 +17,9 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecp.view.model.common.di.annotations.Renderer;
+import org.eclipse.emf.ecp.view.model.common.AbstractRenderer;
import org.eclipse.emf.ecp.view.model.common.di.annotations.ViewService;
+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.VViewPackage;
import org.eclipse.emfforms.bazaar.Bid;
@@ -62,20 +63,36 @@
}
/**
- * Create a terminal reveal step to focus into the specific setting control in a
- * container {@code element}.
+ * Create a terminal reveal step to focus into the specific setting {@code control}
+ * in a that presents a {@code feature} or an {@code object}.
*
- * @param renderer the renderer of the control to reveal
+ * @param control the control to reveal
* @param object the object to reveal
* @param feature the feature of the domain {@code object} to reveal
+ * @param context the view-model context in which the {@code control} is rendered
* @return the specific control reveal step
*/
@Create
- public RevealStep reveal(@Renderer AbstractSWTRenderer<?> renderer, EObject object,
- EStructuralFeature feature) {
+ public RevealStep reveal(VControl control, EObject object,
+ EStructuralFeature feature, ViewModelContext context) {
- return RevealStep.reveal(renderer.getVElement(), object, feature,
- () -> Display.getDefault().asyncExec(renderer::scrollToReveal));
+ return RevealStep.reveal(control, object, feature,
+ // Scroll to reveal the control in the future, when it has been
+ // rendered by the previous reveal step (bug 551066)
+ () -> Display.getDefault().asyncExec(() -> scrollToReveal(control, context)));
+ }
+
+ /**
+ * Scroll to reveal the rendered {@code control}.
+ *
+ * @param control a control rendered in some {@code context}
+ * @param context the context in which the {@code control} is rendered
+ */
+ private void scrollToReveal(VControl control, ViewModelContext context) {
+ final AbstractRenderer<?> renderer = AbstractRenderer.getRenderer(control, context);
+ if (renderer instanceof AbstractSWTRenderer<?>) {
+ ((AbstractSWTRenderer<?>) renderer).scrollToReveal();
+ }
}
}
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl.java
new file mode 100644
index 0000000..6e2b07d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl.java
@@ -0,0 +1,124 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Lucas Koehler - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.swt.core.ui;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * Default implementation of the {@link SWTValidationUiService} which delegates to the {@link SWTValidationHelper} to
+ * get the validation icons and colors.
+ *
+ * @author Lucas Koehler
+ *
+ */
+@Component
+public class SWTValidationUiServiceImpl implements SWTValidationUiService {
+
+ private final Map<Integer, Color> severityBackgroundColorMap = new HashMap<Integer, Color>();
+ private final Map<Integer, Color> severityForegroundColorMap = new HashMap<Integer, Color>();
+ private final Map<Integer, Image> severityIconMap = new HashMap<Integer, Image>();
+ private SWTValidationHelper validationHelper = SWTValidationHelper.INSTANCE;
+
+ /** Default constructor. */
+ public SWTValidationUiServiceImpl() {
+ // Nothing to do here
+ }
+
+ /**
+ * Test constructor that allows specifying a custom {@link SWTValidationHelper}.
+ *
+ * @param validationHelper The custom {@link SWTValidationHelper}
+ */
+ SWTValidationUiServiceImpl(SWTValidationHelper validationHelper) {
+ this.validationHelper = validationHelper;
+ }
+
+ @Override
+ public Image getValidationIcon(Diagnostic diagnostic, VElement vElement, ViewModelContext viewModelContext) {
+ final int severity = severity(diagnostic);
+ if (!severityIconMap.containsKey(severity)) {
+ final Image validationIcon = validationHelper.getValidationIcon(severity, vElement, viewModelContext);
+ severityIconMap.put(severity, validationIcon);
+ }
+ return severityIconMap.get(severity);
+ }
+
+ @Override
+ public Image getValidationIcon(VElement vElement, ViewModelContext viewModelContext) {
+ return getValidationIcon(highestSeverityDiagnostic(vElement), vElement, viewModelContext);
+ }
+
+ @Override
+ public Color getValidationForegroundColor(Diagnostic diagnostic, VElement vElement,
+ ViewModelContext viewModelContext) {
+ final int severity = severity(diagnostic);
+ if (!severityForegroundColorMap.containsKey(severity)) {
+ final Color validationForegroundColor = validationHelper.getValidationForegroundColor(severity, vElement,
+ viewModelContext);
+ severityForegroundColorMap.put(severity, validationForegroundColor);
+ }
+ return severityForegroundColorMap.get(severity);
+ }
+
+ @Override
+ public Color getValidationForegroundColor(VElement vElement, ViewModelContext viewModelContext) {
+ return getValidationForegroundColor(highestSeverityDiagnostic(vElement), vElement, viewModelContext);
+ }
+
+ @Override
+ public Color getValidationBackgroundColor(Diagnostic diagnostic, VElement vElement,
+ ViewModelContext viewModelContext) {
+ final int severity = severity(diagnostic);
+ if (!severityBackgroundColorMap.containsKey(severity)) {
+ final Color validationBackgroundColor = validationHelper.getValidationBackgroundColor(severity, vElement,
+ viewModelContext);
+ severityBackgroundColorMap.put(severity, validationBackgroundColor);
+ }
+ return severityBackgroundColorMap.get(severity);
+ }
+
+ @Override
+ public Color getValidationBackgroundColor(VElement vElement, ViewModelContext viewModelContext) {
+ return getValidationBackgroundColor(highestSeverityDiagnostic(vElement), vElement, viewModelContext);
+ }
+
+ private static Diagnostic highestSeverityDiagnostic(VElement element) {
+ Diagnostic mostSevere = Diagnostic.OK_INSTANCE;
+ final VDiagnostic vDiagnostic = element.getDiagnostic();
+ if (vDiagnostic != null && vDiagnostic.getDiagnostics().size() > 0) {
+ for (final Object o : vDiagnostic.getDiagnostics()) {
+ final Diagnostic diagnostic = (Diagnostic) o;
+ mostSevere = mostSevere.getSeverity() >= diagnostic.getSeverity() ? mostSevere : diagnostic;
+ }
+ }
+ return mostSevere;
+ }
+
+ /** Wrap getting a Diagnostic's severity to make the call null-safe. */
+ private static int severity(Diagnostic diagnostic) {
+ // If there is no diagnostic, we assume everything is ok.
+ return diagnostic != null ? diagnostic.getSeverity() : Diagnostic.OK;
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/ui/SWTValidationHelper.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/ui/SWTValidationHelper.java
new file mode 100644
index 0000000..a49f7e7
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/ui/SWTValidationHelper.java
@@ -0,0 +1,639 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ * Eugen Neufeld - VTViewTemplate implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.core.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+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.validation.model.VTValidationFactory;
+import org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty;
+import org.eclipse.emfforms.internal.swt.core.Activator;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * Helper class for accessing icons and colours for validations.
+ *
+ * @author jfaltermeier
+ * @since 1.23
+ *
+ */
+public class SWTValidationHelper {
+
+ /**
+ * The instance of the SWTValidationHelper.
+ */
+ public static final SWTValidationHelper INSTANCE = new SWTValidationHelper();
+ private final Map<String, Color> colorMap = new LinkedHashMap<String, Color>();
+ private VTValidationStyleProperty defaultValidationStyle;
+
+ /**
+ * Returns the background color for a control with the given validation severity, VElement
+ * and view model context, if applicable.
+ *
+ * @param severity severity the severity of the {@link Diagnostic}
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the color to be used as a background color
+ */
+ public Color getValidationBackgroundColor(int severity, VElement vElement, ViewModelContext viewModelContext) {
+ final VTValidationStyleProperty defaultStyle = getDefaultValidationStyle();
+ String colorHex = null;
+
+ switch (severity) {
+ case Diagnostic.OK:
+ colorHex = getOkColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.INFO:
+ colorHex = getInfoColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.WARNING:
+ colorHex = getWarningColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.ERROR:
+ colorHex = getErrorColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.CANCEL:
+ colorHex = getCancelColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "The specified severity value " + severity + " is invalid. See Diagnostic class."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (colorHex == null) {
+ return null;
+ }
+ if (!colorMap.containsKey(colorHex)) {
+ colorMap.put(colorHex, getColor(colorHex));
+ }
+ return colorMap.get(colorHex);
+ }
+
+ /**
+ * Returns the foreground color for a control with the given validation severity, VElement
+ * and view model context, if applicable.
+ *
+ * @param severity severity the severity of the {@link Diagnostic}
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the color to be used as a foreground color
+ * @since 1.10
+ */
+ public Color getValidationForegroundColor(int severity, VElement vElement, ViewModelContext viewModelContext) {
+ final VTValidationStyleProperty defaultStyle = getDefaultValidationStyle();
+ String colorHex = null;
+
+ switch (severity) {
+ case Diagnostic.OK:
+ colorHex = getOkForegroundColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.INFO:
+ colorHex = getInfoForegroundColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.WARNING:
+ colorHex = getWarningForegroundColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.ERROR:
+ colorHex = getErrorForegroundColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.CANCEL:
+ colorHex = getCancelForegroundColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "The specified severity value " + severity + " is invalid. See Diagnostic class."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (colorHex == null) {
+ return null;
+ }
+ if (!colorMap.containsKey(colorHex)) {
+ colorMap.put(colorHex, getColor(colorHex));
+ }
+ return colorMap.get(colorHex);
+ }
+
+ /**
+ * Returns the background color for a control with the given validation severity.
+ *
+ * @param severity severity the severity of the {@link Diagnostic}
+ * @return the color to be used as a background color
+ */
+ public Color getValidationBackgroundColor(int severity) {
+ return getValidationBackgroundColor(severity, null, null);
+ }
+
+ /**
+ * Returns the foreground color for a control with the given validation severity.
+ *
+ * @param severity severity the severity of the {@link Diagnostic}
+ * @return the color to be used as a foreground color
+ * @since 1.10
+ */
+ public Color getValidationForegroundColor(int severity) {
+ return getValidationForegroundColor(severity, null, null);
+ }
+
+ /**
+ * Returns the hex color for a control with the given validation severity, VElement
+ * and view model context, if applicable.
+ *
+ * @param severity severity the severity of the {@link Diagnostic}
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the hex value to be used
+ * @since 1.9
+ */
+ public String getValidationColorHEX(int severity, VElement vElement, ViewModelContext viewModelContext) {
+ final VTValidationStyleProperty defaultStyle = getDefaultValidationStyle();
+ String colorHex = null;
+
+ switch (severity) {
+ case Diagnostic.OK:
+ colorHex = getOkColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.INFO:
+ colorHex = getInfoColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.WARNING:
+ colorHex = getWarningColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.ERROR:
+ colorHex = getErrorColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.CANCEL:
+ colorHex = getCancelColorHEX(defaultStyle, vElement, viewModelContext);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "The specified severity value " + severity + " is invalid. See Diagnostic class."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ return colorHex;
+ }
+
+ /**
+ * Returns the validation icon matching the given severity, VElement
+ * and view model context, if applicable.
+ *
+ * @param severity the severity of the {@link Diagnostic}
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the icon to be displayed, or <code>null</code> when no icon is to be displayed
+ */
+ public Image getValidationIcon(int severity, VElement vElement, ViewModelContext viewModelContext) {
+ final VTValidationStyleProperty defaultStyle = getDefaultValidationStyle();
+ String imageUrl = null;
+
+ switch (severity) {
+ case Diagnostic.OK:
+ imageUrl = getOkImageURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.INFO:
+ imageUrl = getInfoImageURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.WARNING:
+ imageUrl = getWarningImageURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.ERROR:
+ imageUrl = getErrorImageURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.CANCEL:
+ imageUrl = getCancelImageURL(defaultStyle, vElement, viewModelContext);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "The specified severity value " + severity + " is invalid. See Diagnostic class."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (imageUrl == null) {
+ return null;
+ }
+ try {
+ return Activator.getImage(new URL(imageUrl));
+ } catch (final MalformedURLException ex) {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the validation icon matching the given severity.
+ *
+ * @param severity the severity of the {@link Diagnostic}
+ * @return the icon to be displayed, or <code>null</code> when no icon is to be displayed
+ */
+ public Image getValidationIcon(int severity) {
+ return getValidationIcon(severity, null, null);
+ }
+
+ /**
+ * Returns the validation overlay icon matching the given severity, VElement
+ * and view model context, if applicable.
+ *
+ * @param severity the severity of the {@link Diagnostic}
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the icon to be displayed, or <code>null</code> when no icon is to be displayed
+ */
+ public ImageDescriptor getValidationOverlayDescriptor(int severity, VElement vElement,
+ ViewModelContext viewModelContext) {
+ final VTValidationStyleProperty defaultStyle = getDefaultValidationStyle();
+ String imageUrl = null;
+
+ switch (severity) {
+ case Diagnostic.OK:
+ imageUrl = getOkOverlayURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.INFO:
+ imageUrl = getInfoOverlayURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.WARNING:
+ imageUrl = getWarningOverlayURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.ERROR:
+ imageUrl = getErrorOverlayURL(defaultStyle, vElement, viewModelContext);
+ break;
+ case Diagnostic.CANCEL:
+ imageUrl = getCancelOverlayURL(defaultStyle, vElement, viewModelContext);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "The specified severity value " + severity + " is invalid. See Diagnostic class."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (imageUrl == null) {
+ return null;
+ }
+ try {
+ return ImageDescriptor.createFromURL(new URL(imageUrl));
+ } catch (final MalformedURLException ex) {
+ return null;
+ }
+ }
+
+ /**
+ * Returns an image descriptor which can be used as an overlay for validation icons.
+ *
+ * @param severity the severity of the validation
+ * @return the descriptor
+ */
+ public ImageDescriptor getValidationOverlayDescriptor(int severity) {
+ return getValidationOverlayDescriptor(severity, null, null);
+ }
+
+ private String getOkColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getOkColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getOkColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getOkForegroundColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getOkForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getOkForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getInfoColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getInfoColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getInfoColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getInfoForegroundColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getInfoForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getInfoForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getWarningColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getWarningColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getWarningColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getWarningForegroundColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getWarningForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getWarningForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getErrorColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getErrorColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getErrorColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getErrorForegroundColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getErrorForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getErrorForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getCancelColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getCancelColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getCancelColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getCancelForegroundColorHEX(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ colorHex = defaultStyle.getCancelForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getCancelForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
+ private String getOkImageURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String imageURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ imageURL = defaultStyle.getOkImageURL();
+ }
+ if (validationStyleProperty != null) {
+ imageURL = validationStyleProperty.getOkImageURL();
+ }
+ return imageURL;
+ }
+
+ private String getInfoImageURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String imageURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ imageURL = defaultStyle.getInfoImageURL();
+ }
+ if (validationStyleProperty != null) {
+ imageURL = validationStyleProperty.getInfoImageURL();
+ }
+ return imageURL;
+ }
+
+ private String getWarningImageURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String imageURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ imageURL = defaultStyle.getWarningImageURL();
+ }
+ if (validationStyleProperty != null) {
+ imageURL = validationStyleProperty.getWarningImageURL();
+ }
+ return imageURL;
+ }
+
+ private String getErrorImageURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String imageURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ imageURL = defaultStyle.getErrorImageURL();
+ }
+ if (validationStyleProperty != null) {
+ imageURL = validationStyleProperty.getErrorImageURL();
+ }
+ return imageURL;
+ }
+
+ private String getCancelImageURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String imageURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ imageURL = defaultStyle.getCancelImageURL();
+ }
+ if (validationStyleProperty != null) {
+ imageURL = validationStyleProperty.getCancelImageURL();
+ }
+ return imageURL;
+ }
+
+ private String getOkOverlayURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String overlayURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ overlayURL = defaultStyle.getOkOverlayURL();
+ }
+ if (validationStyleProperty != null) {
+ overlayURL = validationStyleProperty.getOkOverlayURL();
+ }
+ return overlayURL;
+ }
+
+ private String getInfoOverlayURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String overlayURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ overlayURL = defaultStyle.getInfoOverlayURL();
+ }
+ if (validationStyleProperty != null) {
+ overlayURL = validationStyleProperty.getInfoOverlayURL();
+ }
+ return overlayURL;
+ }
+
+ private String getWarningOverlayURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String overlayURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ overlayURL = defaultStyle.getWarningOverlayURL();
+ }
+ if (validationStyleProperty != null) {
+ overlayURL = validationStyleProperty.getWarningOverlayURL();
+ }
+ return overlayURL;
+ }
+
+ private String getErrorOverlayURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String overlayURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ overlayURL = defaultStyle.getErrorOverlayURL();
+ }
+ if (validationStyleProperty != null) {
+ overlayURL = validationStyleProperty.getErrorOverlayURL();
+ }
+ return overlayURL;
+ }
+
+ private String getCancelOverlayURL(VTValidationStyleProperty defaultStyle, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String overlayURL = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (defaultStyle != null) {
+ overlayURL = defaultStyle.getCancelOverlayURL();
+ }
+ if (validationStyleProperty != null) {
+ overlayURL = validationStyleProperty.getCancelOverlayURL();
+ }
+ return overlayURL;
+ }
+
+ private VTValidationStyleProperty getValidationStyleProperty(VElement vElement, ViewModelContext viewModelContext) {
+ VTValidationStyleProperty validationStyleProperty = null;
+ if (vElement != null && viewModelContext != null) {
+ final VTViewTemplateProvider vtViewTemplateProvider = Activator.getDefault().getVTViewTemplateProvider();
+ if (vtViewTemplateProvider == null) {
+ return validationStyleProperty;
+ }
+ final Set<VTStyleProperty> styleProperties = vtViewTemplateProvider.getStyleProperties(vElement,
+ viewModelContext);
+ for (final VTStyleProperty styleProperty : styleProperties) {
+ if (VTValidationStyleProperty.class.isInstance(styleProperty)) {
+ validationStyleProperty = VTValidationStyleProperty.class
+ .cast(styleProperty);
+ break;
+ }
+ }
+ }
+ return validationStyleProperty;
+ }
+
+ /**
+ * @return The default validation style to apply if none is specified for a {@link VElement}.
+ */
+ private VTValidationStyleProperty getDefaultValidationStyle() {
+ if (defaultValidationStyle == null) {
+ defaultValidationStyle = VTValidationFactory.eINSTANCE.createValidationStyleProperty();
+ defaultValidationStyle.setOkColorHEX("ffffff"); //$NON-NLS-1$
+ defaultValidationStyle.setErrorColorHEX("ff0000"); //$NON-NLS-1$
+ defaultValidationStyle.setWarningColorHEX("FFD800");//$NON-NLS-1$
+ defaultValidationStyle.setErrorImageURL(Activator.getDefault().getBundle()
+ .getResource("icons/validation_error.png").toExternalForm()); //$NON-NLS-1$
+ defaultValidationStyle.setErrorOverlayURL(Activator.getDefault().getBundle()
+ .getResource("icons/error_decorate.png").toExternalForm()); //$NON-NLS-1$
+ defaultValidationStyle.setWarningImageURL(Activator.getDefault().getBundle()
+ .getResource("icons/validation_warning.png").toExternalForm()); //$NON-NLS-1$
+ defaultValidationStyle.setWarningOverlayURL(Activator.getDefault().getBundle()
+ .getResource("icons/warning_decorate.png").toExternalForm()); //$NON-NLS-1$
+ defaultValidationStyle.setInfoOverlayURL(Activator.getDefault().getBundle()
+ .getResource("icons/info_decorate.gif").toExternalForm()); //$NON-NLS-1$
+ }
+ return defaultValidationStyle;
+ }
+
+ /**
+ * @param colorHex
+ * @return
+ */
+ private Color getColor(String colorHex) {
+ final String redString = colorHex.substring(0, 2);
+ final String greenString = colorHex.substring(2, 4);
+ final String blueString = colorHex.substring(4, 6);
+ final int red = Integer.parseInt(redString, 16);
+ final int green = Integer.parseInt(greenString, 16);
+ final int blue = Integer.parseInt(blueString, 16);
+ return new Color(Display.getDefault(), red, green, blue);
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/ui/SWTValidationUiService.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/ui/SWTValidationUiService.java
new file mode 100644
index 0000000..5de1704
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/ui/SWTValidationUiService.java
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Lucas Koehler - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.core.ui;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Service implementations provide visualizations (icons and colors) for validation results.
+ *
+ * @author Lucas Koehler
+ * @since 1.23
+ *
+ */
+public interface SWTValidationUiService {
+
+ /**
+ * Returns the validation icon matching the given Diagnostic, VElement
+ * and view model context, if applicable.
+ *
+ * @param diagnostic the {@link Diagnostic} defining the validation visualization
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the icon to be displayed, or <code>null</code> when no icon is to be displayed
+ */
+ Image getValidationIcon(Diagnostic diagnostic, VElement vElement, ViewModelContext viewModelContext);
+
+ /**
+ * Returns the validation icon matching the highest severity of the given VElement's diagnostic.
+ *
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the icon to be displayed, or <code>null</code> when no icon is to be displayed
+ */
+ Image getValidationIcon(VElement vElement, ViewModelContext viewModelContext);
+
+ /**
+ * Returns the foreground color for a control with the given Diagnostic, VElement
+ * and view model context, if applicable.
+ *
+ * @param diagnostic the {@link Diagnostic} defining the validation visualization
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the color to be used as a foreground color
+ */
+ Color getValidationForegroundColor(Diagnostic diagnostic, VElement vElement, ViewModelContext viewModelContext);
+
+ /**
+ * Returns the foreground color for a control matching the highest severity of the given VElement's diagnostic.
+ *
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the color to be used as a foreground color
+ */
+ Color getValidationForegroundColor(VElement vElement, ViewModelContext viewModelContext);
+
+ /**
+ * Returns the background color for a control with the given Diagnostic, VElement
+ * and view model context, if applicable.
+ *
+ * @param diagnostic the {@link Diagnostic} defining the validation visualization
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the color to be used as a background color
+ */
+ Color getValidationBackgroundColor(Diagnostic diagnostic, VElement vElement, ViewModelContext viewModelContext);
+
+ /**
+ * Returns the background color for a control matching the highest severity of the given VElement's diagnostic.
+ *
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the color to be used as a background color
+ */
+ Color getValidationBackgroundColor(VElement vElement, ViewModelContext viewModelContext);
+ // TODO more methods?
+}
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/.settings/.api_filters b/bundles/org.eclipse.emfforms.swt.reference.table/.settings/.api_filters
new file mode 100644
index 0000000..fbb74bb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/.settings/.api_filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emfforms.swt.reference.table" version="2">
+ <resource path="src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java" type="org.eclipse.emfforms.swt.internal.reference.table.DummyDomainExpander">
+ <filter comment="Fixed since tags that were missing" id="1108344834">
+ <message_arguments>
+ <message_argument value="1.22"/>
+ <message_argument value="1.23"/>
+ <message_argument value="org.eclipse.emfforms.swt.internal.reference.table.DummyDomainExpander"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java" type="org.eclipse.emfforms.swt.internal.reference.table.SelectionTableCompositeStrategyProvider">
+ <filter comment="Fixed since tags that were missing" id="1108344834">
+ <message_arguments>
+ <message_argument value="1.22"/>
+ <message_argument value="1.23"/>
+ <message_argument value="org.eclipse.emfforms.swt.internal.reference.table.SelectionTableCompositeStrategyProvider"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java" type="org.eclipse.emfforms.swt.internal.reference.table.TableSelectionCompositeImpl">
+ <filter comment="Fixed since tags that were missing" id="1108344834">
+ <message_arguments>
+ <message_argument value="1.22"/>
+ <message_argument value="1.23"/>
+ <message_argument value="org.eclipse.emfforms.swt.internal.reference.table.TableSelectionCompositeImpl"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF
index e976df0..37c5b67 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/META-INF/MANIFEST.MF
@@ -2,29 +2,32 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Reference Selection Composite
Bundle-SymbolicName: org.eclipse.emfforms.swt.reference.table;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
-Import-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.core.swt;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Service-Component: OSGI-INF/selectionTableCompositeStrategyProvider.xml
+Bundle-ActivationPolicy: lazy
+Import-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.core.swt;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
org.eclipse.swt;version="0.0.0",
@@ -32,6 +35,3 @@
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.service.component.annotations;version="1.3.0"
Automatic-Module-Name: org.eclipse.emfforms.swt.reference.table
-Service-Component: OSGI-INF/selectionTableCompositeStrategyProvider.xml
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml b/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml
index 510b255..006d302 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.swt.reference.table</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java
index a0c4839..3d002c4 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java
@@ -22,8 +22,9 @@
/**
* Dummy Domain expander doing nothing because we do not need to expand the extent segments.
- *
+ *
* @author Lucas Koehler
+ * @since 1.22
*
*/
public class DummyDomainExpander implements EMFFormsDMRSegmentExpander {
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java
index 0c902e6..e64fac3 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java
@@ -46,6 +46,8 @@
/**
* Provider of a selection composite strategy that builds a selection table viewer
* from a {@linkplain VTableControl table control model}.
+ *
+ * @since 1.22
*/
@Component(name = "selectionTableCompositeStrategyProvider")
public class SelectionTableCompositeStrategyProvider implements SelectionCompositeStrategy.Provider {
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java
index 114cf07..e98d8e2 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java
@@ -81,6 +81,8 @@
/**
* Implementation of a table selection composite that is described by a view model.
+ *
+ * @since 1.22
*/
public class TableSelectionCompositeImpl extends SelectModelElementCompositeImpl {
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 8c69ae4..69634b7 100644
--- a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table
Bundle-SymbolicName: org.eclipse.emfforms.swt.table
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.action;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.messages;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.util;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.22.0",
- org.eclipse.emfforms.spi.swt.table.action;version="1.22.0",
- org.eclipse.emfforms.spi.swt.table.util;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.action;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.messages;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.table.action;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.table.util;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.table
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)",
org.eclipse.jface.bindings.keys;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;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 7d8db0c..b77953c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 75cdbf7..084ae9f 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,16 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.23.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default
Import-Package: org.eclipse.jface.resource;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 8add1ac..3322363 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java
index 72a75af..bb6e6f7 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java
@@ -19,7 +19,7 @@
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationHelper;
import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache.ValidationListener;
import org.eclipse.jface.resource.DeviceResourceManager;
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 e41728d..980b4ad 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: Treemasterdetail SWT Util
Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.22.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.22.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
- org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.22.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.22.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.22.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.22.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.22.0"
+Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.23.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.23.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
+ org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.equinox.registry;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.treemasterdetail
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.action;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.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.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/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
index 21d4be6..af0bb2b 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/diagnostic/DiagnosticCache.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/diagnostic/DiagnosticCache.java
index a6ab6b7..0150ed0 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/diagnostic/DiagnosticCache.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/diagnostic/DiagnosticCache.java
@@ -34,6 +34,7 @@
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.Setting;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -106,15 +107,28 @@
initializing = true;
try {
+ if (input == null) {
+ return;
+ }
this.input = input;
validationChangeListener = new ValidationChangeListener(input);
TreeIterator<Object> allContents;
+ final Set<EObject> externalReferences = new LinkedHashSet<EObject>();
if (ResourceSet.class.isInstance(input)) {
- allContents = EcoreUtil.getAllContents(ResourceSet.class.cast(input), false);
+ final ResourceSet resourceSet = ResourceSet.class.cast(input);
+ allContents = EcoreUtil.getAllContents(resourceSet, false);
+ final Map<EObject, Collection<Setting>> map = EcoreUtil.ExternalCrossReferencer.find(resourceSet);
+ externalReferences.addAll(map.keySet());
} else if (Resource.class.isInstance(input)) {
- allContents = EcoreUtil.getAllContents(Resource.class.cast(input), false);
+ final Resource resource = Resource.class.cast(input);
+ allContents = EcoreUtil.getAllContents(resource, false);
+ final Map<EObject, Collection<Setting>> map = EcoreUtil.ExternalCrossReferencer.find(resource);
+ externalReferences.addAll(map.keySet());
} else if (EObject.class.isInstance(input)) {
- allContents = EcoreUtil.getAllContents(Collections.singleton(EObject.class.cast(input)), false);
+ final Set<EObject> set = Collections.singleton(EObject.class.cast(input));
+ allContents = EcoreUtil.getAllContents(set, false);
+ final Map<EObject, Collection<Setting>> map = EcoreUtil.ExternalCrossReferencer.find(set);
+ externalReferences.addAll(map.keySet());
} else {
return;
}
@@ -126,6 +140,7 @@
}
updateCacheWithoutRefresh(EObject.class.cast(next), this);
}
+ externalReferences.forEach(e -> updateCacheWithoutRefresh(e, this));
} finally {
initializing = wasInitializing;
}
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 5c896bd..06891ef 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,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emfforms.view.annotation.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 cfeb086..b7180ac 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 82e4481..f0c79ed 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.22.0",
- org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.22.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.23.0",
+ org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emfforms.view.annotation.model
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml b/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
index bf1d2da..e3bcb97 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c530fe6..a9acf30 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,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emfforms.view.controlgrid.model.edit
-Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.22.0,1.23.0)";resolution:=optional,
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.22.0,1.23.0)";resolution:=optional
+Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.23.0,1.24.0)";resolution:=optional,
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.23.0,1.24.0)";resolution:=optional
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 c546280..c5c8c47 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c72748e..9600b21 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.22.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.22.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.23.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.23.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emfforms.view.controlgrid.model
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
index dcfa405..d4c4c1d 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF
index 146c86d..455e0fd 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.indexsegment.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emfforms.spi.view.indexsegment.model.provider.IndexsegmentEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model.provider;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model.provider;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.view.indexsegment.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emfforms.view.indexsegment.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml
index 755275f..61b5339 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model.edit/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.view.indexsegment.model.edit</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF
index ac8fd42..54c13e1 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.indexsegment.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model;version="1.22.0",
- org.eclipse.emfforms.spi.view.indexsegment.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.indexsegment.model.util;version="1.22.0";x-friends:="org.eclipse.emfforms.view.indexsegment.model.edit"
+Export-Package: org.eclipse.emfforms.spi.view.indexsegment.model;version="1.23.0",
+ org.eclipse.emfforms.spi.view.indexsegment.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.indexsegment.model.util;version="1.23.0";x-friends:="org.eclipse.emfforms.view.indexsegment.model.edit"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emfforms.view.indexsegment.model
diff --git a/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml b/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml
index e507013..684b501 100644
--- a/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.indexsegment.model/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.view.indexsegment.model</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF
index 439b744..5ab4cb2 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.mappingsegment.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emfforms.spi.view.mappingsegment.model.provider.MappingsegmentEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model.provider;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model.provider;version="1.23.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.view.mappingsegment.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emfforms.view.mappingsegment.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml
index 436022f..c9ea1d6 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model.edit/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.view.mappingsegment.model.edit</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF
index 6bb6ec2..416313a 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.mappingsegment.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model;version="1.22.0",
- org.eclipse.emfforms.spi.view.mappingsegment.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.mappingsegment.model.util;version="1.22.0";x-friends:="org.eclipse.emfforms.view.mappingsegment.model.edit"
+Export-Package: org.eclipse.emfforms.spi.view.mappingsegment.model;version="1.23.0",
+ org.eclipse.emfforms.spi.view.mappingsegment.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.mappingsegment.model.util;version="1.23.0";x-friends:="org.eclipse.emfforms.view.mappingsegment.model.edit"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emfforms.view.mappingsegment.model
diff --git a/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml b/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml
index 9763777..1c961c7 100644
--- a/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.mappingsegment.model/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.view.mappingsegment.model</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
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 163b73c..f52e55d 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms View Localization
Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.view.model.localization
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.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 17ebb45..e39b582 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF
index 655a05f..732e075 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.multisegment.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emfforms.view.spi.multisegment.model.provider.MultisegmentEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.emfforms.view.spi.multisegment.model.provider;version="2.0.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.view.multisegment.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emfforms.view.multisegment.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml
index 3e44ff0..8fae56c 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model.edit/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.view.multisegment.model.edit</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF
index bdc209b..953442b 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.multisegment.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.view.spi.multisegment.model;version="1.22.0",
- org.eclipse.emfforms.view.spi.multisegment.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.view.spi.multisegment.model.util;version="1.22.0";x-friends:="org.eclipse.emfforms.view.multisegment.model.edit"
+Export-Package: org.eclipse.emfforms.view.spi.multisegment.model;version="1.23.0",
+ org.eclipse.emfforms.view.spi.multisegment.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.view.spi.multisegment.model.util;version="1.23.0";x-friends:="org.eclipse.emfforms.view.multisegment.model.edit"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emfforms.view.multisegment.model
diff --git a/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml b/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml
index 126fcae..dfa24cb 100644
--- a/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.multisegment.model/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.view.multisegment.model</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
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 46d7e00..4470e9d 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,8 +13,8 @@
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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.error.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 58d4795..184ffa0 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,13 +11,13 @@
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.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
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.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.internal.core.services.label;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.error.model
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/.project b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/.project
index 259da32..8c70a25 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/.project
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
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 5419c40..6e9e8d4 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,14 +5,14 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.6.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer.categorization
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/.project b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/.project
index 1231574..521aa53 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/.project
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
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 dd66d8d..47fba51 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,8 +5,8 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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.table/.project b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/.project
index 3982010..23bf10c 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/.project
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
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 1b8bfa5..9608379 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,19 +5,19 @@
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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
org.osgi.framework;version="1.8.0",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer.table
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/.project b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/.project
index 77924a1..5359265 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/.project
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
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 da0cfe8..a443dc8 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
@@ -7,20 +7,20 @@
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,1.1.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)"
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.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.spi.context;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.23.0,1.24.0)",
org.osgi.framework;version="1.6.0",
org.osgi.service.component.annotations;version="1.2.0"
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/.project b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/.project
index 0027b2f..e77ac32 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/.project
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/.project
@@ -39,7 +39,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
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 d13bc50..80931cb 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,22 +11,22 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.apache.poi;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.0)"
Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.0)",
org.osgi.framework;version="1.6.0",
org.osgi.service.component.annotations;version="1.2.0"
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core
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 b27414f..412eb99 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,12 +7,12 @@
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.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.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.8
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.file
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 9a075fc..a92de6d 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
@@ -8,11 +8,11 @@
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,1.1.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.stream
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 1c1b396..ab906d0 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample Application e3
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e3;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Framework
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.e3
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 b584b46..defe86b 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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="MakeItHappen Sample e3 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e3" id="org.eclipse.emf.ecp.makeithappen.application.sample.e3.product" application="org.eclipse.emf.ecp.makeithappen.application.sample.e3.application" version="1.20.0" useFeatures="true" includeLaunchers="true">
+<product name="MakeItHappen Sample e3 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e3" id="org.eclipse.emf.ecp.makeithappen.application.sample.e3.product" application="org.eclipse.emf.ecp.makeithappen.application.sample.e3.application" version="1.23.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
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 5a7a17d..7527934 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,7 +15,7 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<properties>
<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>
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 6d071ac..089cb9b 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,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample Application e4
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e4;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.23.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)",
@@ -16,10 +16,10 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.e4
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 ea0b90e..e9361b3 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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="MakeItHappen Sample e4 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e4" id="org.eclipse.emf.ecp.makeithappen.application.sample.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.20.0" useFeatures="true" includeLaunchers="true">
+<product name="MakeItHappen Sample e4 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e4" id="org.eclipse.emf.ecp.makeithappen.application.sample.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.23.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
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 2c767e0..3f28e04 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,7 +15,7 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<properties>
<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>
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 038c323..824bf04 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,8 +8,8 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.fx
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 22c021c..c00cbc7 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample J2ee RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.rap.jface;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
org.eclipse.rap.jface.databinding;bundle-version="[2.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee
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 99997eb..0291724 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.emfforms.runtime.feature.feature.group" version="0.0.0"/>
<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"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_122"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_123"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
@@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-06"/>
+<repository location="http://download.eclipse.org/releases/2019-09"/>
</location>
</locations>
</target>
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 ee3ceb5..242f849 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,7 +15,7 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<properties>
<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>
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 bcbfdd2..3f9c04a 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample RAP Application
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.application.sample.rap
Bundle-ActivationPolicy: lazy
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 9668bd8..d101971 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.emfforms.runtime.feature.feature.group" version="0.0.0"/>
<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"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_122"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_123"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
@@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-06"/>
+<repository location="http://download.eclipse.org/releases/2019-09"/>
</location>
</locations>
</target>
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 31e42aa..e017641 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,7 +15,7 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<properties>
<jacoco.percentage.instruction>0.0</jacoco.percentage.instruction>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml
index 9393f5c..fd78e92 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.makeithappen.e3"
label="The Make it happen 3x Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.makeithappen.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml
index 94e54b0..c8601f7 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e3.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.e3</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
<plugins>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml
index 0cf88ab..eef5031 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.makeithappen.e4"
label="The Make it happen e4 Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.makeithappen.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml
index 466e76a..712c677 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.e4.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.e4</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
<plugins>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
index 5f88ebe..4a64cd4 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.makeithappen.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 e95b054..79afd90 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 9af4e44..8952659 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.makeithappen.model.edit
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 04b5b6c..64c9947 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 47bfaab..c32846f 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 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.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 49cf9b9..34cf324 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 46c8a0a..f1acd18 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.22.0",
- org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.22.0",
- org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.23.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.23.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.23.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.8
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
index 882f8de..db191df 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ac0b5b4..f764902 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,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: EmailControl
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.email.renderer;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/emailRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 03a1387..2419d12 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 33bab7a..0b0b58b 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,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: Expandbar Group Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.group.renderer;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: lib/org.eclipse.nebula.widgets.pgroup_1.0.0.201905211554.jar,
.
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.22.0",
+Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)"
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 bb947d3..dc4abed 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b259e34..cf89ae8 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,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Make It Happen Examples
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.wizards;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.resources;bundle-version="[3.7.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 834c77d..9298601 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
diff --git a/examples/org.eclipse.emfforms.coffee.feature/feature.xml b/examples/org.eclipse.emfforms.coffee.feature/feature.xml
index 0b16bee..08fb02f 100644
--- a/examples/org.eclipse.emfforms.coffee.feature/feature.xml
+++ b/examples/org.eclipse.emfforms.coffee.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.coffee.feature"
label="Coffee Example Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.coffee.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/examples/org.eclipse.emfforms.coffee.feature/pom.xml b/examples/org.eclipse.emfforms.coffee.feature/pom.xml
index faf5f7c..35fe3c8 100644
--- a/examples/org.eclipse.emfforms.coffee.feature/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.coffee.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF
index 7400f2f..09ca6c5 100644
--- a/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.coffee.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emfforms.coffee.model.coffee.provider.CoffeeEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.coffee.model.coffee.provider;version="1.22.0"
+Export-Package: org.eclipse.emfforms.coffee.model.coffee.provider;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.coffee.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emfforms.coffee.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emfforms.coffee.model.edit
Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml b/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml
index 2eb3236..42af719 100644
--- a/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.model.edit/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.coffee.model.edit</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF
index e439671..db3cbfa 100644
--- a/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.model.viewmodel/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emfforms.coffee.model.viewmodel
Bundle-SymbolicName: org.eclipse.emfforms.coffee.model.viewmodel;singleton:=true
-Bundle-Version: 1.22.0.qualifier
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+Bundle-Version: 1.23.0.qualifier
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
diff --git a/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml b/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml
index 44639e6..90581f0 100644
--- a/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.model.viewmodel/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.coffee.model.viewmodel</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF
index 8e6a1a8..df811b3 100644
--- a/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.model/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.coffee.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.coffee.model.coffee;version="1.22.0",
- org.eclipse.emfforms.coffee.model.coffee.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.coffee.model.coffee.util;version="1.22.0"
+Export-Package: org.eclipse.emfforms.coffee.model.coffee;version="1.23.0",
+ org.eclipse.emfforms.coffee.model.coffee.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.coffee.model.coffee.util;version="1.23.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.8
diff --git a/examples/org.eclipse.emfforms.coffee.model/pom.xml b/examples/org.eclipse.emfforms.coffee.model/pom.xml
index f1d61a7..5e28a14 100644
--- a/examples/org.eclipse.emfforms.coffee.model/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.model/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.coffee.model</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF
index f013c9d..f83207e 100644
--- a/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.coffee.wizards/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Coffee Model Example Wizards
Bundle-SymbolicName: org.eclipse.emfforms.coffee.wizards;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.coffee.wizards;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.coffee.wizards;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.example.common.wizards;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)"
diff --git a/examples/org.eclipse.emfforms.coffee.wizards/pom.xml b/examples/org.eclipse.emfforms.coffee.wizards/pom.xml
index 3d61b0e..4a58cd9 100644
--- a/examples/org.eclipse.emfforms.coffee.wizards/pom.xml
+++ b/examples/org.eclipse.emfforms.coffee.wizards/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.coffee.wizards</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF b/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF
index 099a37d..b9ce299 100644
--- a/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emfforms.example.common.wizards/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Wizards for EMFForms Examples
Bundle-SymbolicName: org.eclipse.emfforms.example.common.wizards;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.example.wizards;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.example.wizards;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.example.wizards;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.example.wizards;version="1.23.0"
Require-Bundle: org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
diff --git a/examples/org.eclipse.emfforms.example.common.wizards/pom.xml b/examples/org.eclipse.emfforms.example.common.wizards/pom.xml
index 8bde3ef..3be0b8b 100644
--- a/examples/org.eclipse.emfforms.example.common.wizards/pom.xml
+++ b/examples/org.eclipse.emfforms.example.common.wizards/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.example.common.wizards</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
index b145590..7c44114 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
@@ -14,12 +14,12 @@
<feature
id="org.eclipse.emf.ecp.cdo.feature"
label="ECP CDO Integration (Experimental)"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 8d70d03..226cf6d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 3d14886..4f4e2c9 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 4ae11bc..65c5d5b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 a0d630c..fbedf58 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 1c9e65d..00636bf 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6aeabfc..b0db59c 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 835ad42..60e40d7 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 dbc86a3..d9e3564 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="ECP DiffMerge Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 deba5f9..a524925 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 99e651d..b57817b 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 722efad..1f48d42 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 bf821e8..985bd39 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 1e4cd8e..9ff3969 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c1f51f9..4a00f45 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 f7ed1f9..4ede802 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b9babc7..966749c 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 397fdc8..59bb3d3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 3f21271..3ea6add 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.emf2web.feature"
label="JSON Forms Integration"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 ad63e06..66836e6 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emf2web.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
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 d4bf42d..fcff67a 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 df1e223..1fd7f3d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c8d26a2..18d28f3 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 c131d25..212ef34 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b929331..389dccb 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 5cbb6b4..be46ebe 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 9b9f2ff..a9ab9f3 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 4c30426..dd045ef 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c071c85..3cf2338 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 b595cfb..391ad7a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 37606a5..5f54e15 100644
--- a/features/org.eclipse.emf.ecp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.feature/feature.xml
@@ -14,12 +14,12 @@
<feature
id="org.eclipse.emf.ecp.feature"
label="ECP Core"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 74389c7..414b20d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.i18n.feature/feature.xml b/features/org.eclipse.emf.ecp.i18n.feature/feature.xml
index cb309d1..5725807 100644
--- a/features/org.eclipse.emf.ecp.i18n.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.i18n.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.i18n.feature"
label="ECP i18n Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.i18n.feature/pom.xml b/features/org.eclipse.emf.ecp.i18n.feature/pom.xml
index 17c3510..2d8fcae 100644
--- a/features/org.eclipse.emf.ecp.i18n.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.i18n.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.i18n.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml b/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml
index 380d0d3..84d6f8e 100644
--- a/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ide.migration.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.ide.migration.feature"
label="Namespace View Model Migration Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml b/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml
index 0fa1f80..e1499d2 100644
--- a/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ide.migration.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ide.migration.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 68ddbf5..d78b2e1 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.22.0.qualifier"
+ version="1.23.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 c63cbe7..569e7af 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0df9352..416ce16 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 f783681..0a3ba82 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ce4366f..18132cc 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 655d5f0..4a9505e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8bb1ed3..83510c8 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 b261fa0..68f3686 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8e60582..cead6cd 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 dfab49c..e78ffb2 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8eac583..a32eedf 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 d11869c..f3e22fb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 e4bf210..e44c68a 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 8152f1e..0137ee1 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 44b7dce..3671105 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 80183fb..8f35aa4 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6148387..3dfb51b 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 5a6dcce..9b45375 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8a358ba..b9105b8 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 6e1bdbb..9dd1892 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 eb1d81b..98969c3 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 912c423..25e09dd 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 354f02f..7cab62d 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 773e88a..1a645d5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ed4a42b..1c92a25 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="EMF Forms Dependency Injection Feature (Experimental)"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 2d8128c..39ff56d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 708c566..dc68b29 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 1d2759a..d396651 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2e9a31f..586a7af 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 592a2e4..c94ee84 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f17c24e..61907ec 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="EMF Forms Collapsible Group Renderer using Nebula PGroup"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 7ba6ec3..19fa9cd 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f67e6c5..c7e687c 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 650bdb0..d302cb1 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 d553b9d..e46de58 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 8f25e19..10872db 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 34808f0..5f66040 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="EMF Forms Index DMR Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 d64459d..eb2954f 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 03f6abe..2b6d8b7 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="EMF Forms Key Attribute DMR Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 a830358..2fd63b9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2d5a406..66b5acc 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 5a234b8..0d5f4e5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 af4fddf..f95237e 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="EMF Forms Mapping DMR Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 254d302..b01a3db 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 5683012..88c2720 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 36ef6b3..1e0e4f5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 79f716a..ec01a18 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 d1e0151..ba4eeb3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 dded6b4..d544572 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 ee552ed..0e3a406 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f004d2a..7b97e50 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 fe79621..3a6c9ba 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 d33c54e..e95cbfb 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 3d021a2..b3053a8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ae6cfed..96a3538 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 aef507b..916bdbf 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0c8859c..577b6aa 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="EMF Forms Table UI SWT Additional Cell Editors (non-RAP)"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 a452649..43cbb5c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 eacaec5..e4c4e65 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 cba0ba6..7266821 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0e79da5..4edef24 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 5e5f50a..f80bc21 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8cd7618..46b2b14 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,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.table.ui.rcp.feature"
label="EMF Forms Table UI RCP Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.table.ui.rcp"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 abccc23..ffcd327 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 02c4a71..56c5d79 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 f7ef378..be64968 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 d640fa3..e84772d 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 4cb1c91..d84a737 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 00c6181..695331b 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 aca2c32..7adb0c9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6784784..9a6a892 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 7618d67..8b37758 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 d777e34..2f1a3e6 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="EMF Forms Bean Validation Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 f026266..61fff1c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 3504277..aa93062 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
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 7471a14..13464f8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 cb320f5..f5414a4 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="EMF Forms Deep Validation Initial Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 2e17a49..2fc6455 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2283399..b89f300 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 912aa90..f29d1bf 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0e2c0b3..f9e42c3 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 9da428c..9e014e2 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 007af47..d354e89 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
@@ -14,12 +14,12 @@
<feature
id="org.eclipse.emf.ecp.workspace.feature"
label="ECP File Integration (Experimental)"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 3bba245..038bd72 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
index 540f1ab..2b94e48 100644
--- a/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.common.prevalidation.feature"
label="EMFForms PreValidation Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml b/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
index 4b54bfc..8365147 100644
--- a/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
+++ b/features/org.eclipse.emfforms.common.prevalidation.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml b/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml
index 5e3bb32..3cbe5e8 100644
--- a/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml
+++ b/features/org.eclipse.emfforms.core.bazaar.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emfforms.core.bazaar.feature"
label="Bazaar Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emfforms.core.bazaar"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml b/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml
index 3f5ff77..d0fdd55 100644
--- a/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml
+++ b/features/org.eclipse.emfforms.core.bazaar.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.bazaar.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.datatemplate.feature/feature.xml b/features/org.eclipse.emfforms.datatemplate.feature/feature.xml
index 36323bd..ffc6fb3 100644
--- a/features/org.eclipse.emfforms.datatemplate.feature/feature.xml
+++ b/features/org.eclipse.emfforms.datatemplate.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.datatemplate.feature"
label="EMF Forms Data Templates"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emfforms.datatemplate.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.datatemplate.feature/pom.xml b/features/org.eclipse.emfforms.datatemplate.feature/pom.xml
index c64bba9..bd0bb1e 100644
--- a/features/org.eclipse.emfforms.datatemplate.feature/pom.xml
+++ b/features/org.eclipse.emfforms.datatemplate.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.datatemplate.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml b/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml
index 14691bc..d76afb7 100644
--- a/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml
+++ b/features/org.eclipse.emfforms.datatemplate.ide.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.datatemplate.ide.feature"
label="EMF Forms Datatemplate Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.datatemplate.tooling"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml b/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml
index b00e817..fc5f4b0 100644
--- a/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml
+++ b/features/org.eclipse.emfforms.datatemplate.ide.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.datatemplate.ide.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 1bdc4a0..ef24d0e 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.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.editor"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 219d199..7e380f5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 bf26ea3..f0790f1 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="EMF Forms GenModel Editor Util"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 0e7ad05..4bad500 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.i18n.feature/feature.xml b/features/org.eclipse.emfforms.i18n.feature/feature.xml
index fc72ec1..58e579e 100644
--- a/features/org.eclipse.emfforms.i18n.feature/feature.xml
+++ b/features/org.eclipse.emfforms.i18n.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emfforms.i18n.feature"
label="EMFForms I18n Feature"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="Eclipse Modeling Project">
<description>
diff --git a/features/org.eclipse.emfforms.i18n.feature/pom.xml b/features/org.eclipse.emfforms.i18n.feature/pom.xml
index 0c19650..de4250c 100644
--- a/features/org.eclipse.emfforms.i18n.feature/pom.xml
+++ b/features/org.eclipse.emfforms.i18n.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.i18n.feature</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
index e1a352f..3a7eec0 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="EMF Forms Rule Repository Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 ff73cf7..f98529d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1e8b1e1..7bcb1a8 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="EMF Forms SWT Control for Multi EAttribtues"
- version="1.22.0.qualifier"
+ version="1.23.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.swt.control.multiattribute"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.22.0.qualifier">
+ license-feature-version="1.23.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 fb64a95..e34fd68 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 fa2c915..fb4a300 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="EMF Forms SWT Text Control with Autocomplete Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 9b1cceb..f82c425 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 03e9f87..6893477 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 99d9419..4b31321 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 ac1171e..b3d350e 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="EMF Forms Control Grid SWT Feature (Experimental)"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 86ed8bc..4fc6122 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 e1009a5..9f130c8 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="EMF Forms Annotation View Model Feature"
- version="1.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 563f0f8..d42d6eb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0d57128..514615e 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.22.0.qualifier">
+ license-feature-version="1.23.0.qualifier">
<description>
%description
diff --git a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF
index ff84014..1f5b004 100644
--- a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.common.ui German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui.nl_de
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: OSGI-INF/l10n/bundle
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.common.ui.nl_de
diff --git a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml
index dd9c256..87a7649 100644
--- a/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.common.ui.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.common.ui.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF
index fe108f5..cd6dcee 100644
--- a/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.core.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.core German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.core.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml
index 4195c66..f5b97f6 100644
--- a/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.core.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.core.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF
index 893bd3c..1f838da 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.diffmerge.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml
index 4958627..cc5393d 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.diffmerge.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF
index 631833d..4449804 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.diffmerge.swt German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.swt.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml
index 08cd323..5ca40c4 100644
--- a/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.diffmerge.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.diffmerge.swt.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF
index 5270178..deef4a8 100644
--- a/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml
index 8cf4b9f..45b239f 100644
--- a/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF
index 74f1e6d..0fe6bff 100644
--- a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.edit.swt German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml
index 0b0efc1..ed5a85b 100644
--- a/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.edit.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.edit.swt.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF
index 8a1deae..c3e4b2d 100644
--- a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.ide.editor.view German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml
index 94262d1..4f45134 100644
--- a/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ide.editor.view.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ide.editor.view.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF
index 24ab3d8..ca31dbd 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.makeithappen.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml
index 44a90ae..8d87049 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.makeithappen.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF
index d7d7611..ebdd55e 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.makeithappen.wizards German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.wizards.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.makeithappen.wizards;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.makeithappen.wizards;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml
index 41e4a8d..2199d53 100644
--- a/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.makeithappen.wizards.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.makeithappen.wizards.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF
index b752e19..b3d17c2 100644
--- a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.test.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.test.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.test.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.test.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml
index 3a59822..e8655f3 100644
--- a/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.test.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.test.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF
index 9fd3b73..193a358 100644
--- a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.ui.e3 German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e3.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.e3;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.e3;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml
index 3c49899..ddda494 100644
--- a/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.e3.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.e3.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF
index a03e241..9c6f289 100644
--- a/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.ui German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml
index b550352..944e878 100644
--- a/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF
index 87f9ed9..451fd98 100644
--- a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.ui.validation German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml
index 3d9d2a4..7044c95 100644
--- a/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.validation.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.validation.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF
index 2f61b49..49e65ec 100644
--- a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.ui.view.editor.controls German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml
index 257bb67..8ac152b 100644
--- a/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.ui.view.editor.controls.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF
index 43effb1..77c4448 100644
--- a/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.validation.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.validation German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml
index 8c68299..03965db 100644
--- a/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.validation.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF
index 2ab35a0..3c7cb61 100644
--- a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.categorization.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml
index 7171534..68d607e 100644
--- a/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.categorization.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.categorization.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF
index b405d1b..6e90fa1 100644
--- a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.core.swt German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml
index 1f9bb6f..a2b86e1 100644
--- a/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.core.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.core.swt.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF
index abdea8f..7d20e14 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.custom.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.custom.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.custom.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml
index f976bd0..dde02ab 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.custom.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF
index 053ae31..3396e0e 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.custom.model German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml
index 14f2d14..bd4e2c1 100644
--- a/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.custom.model.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.custom.model.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF
index ae6c63a..591b731 100644
--- a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.dynamictree.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml
index 6b88220..2294dd2 100644
--- a/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF
index d8cbeb6..e06a9c1 100644
--- a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.group.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.group.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml
index cdd4827..b3c306c 100644
--- a/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.group.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.group.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF
index 2978be8..fe34a21 100644
--- a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.groupedgrid.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.groupedgrid.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.groupedgrid.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml
index 2db7f6a..d9af1fd 100644
--- a/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.groupedgrid.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF
index 6c596af..11090b8 100644
--- a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.horizontal.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml
index d63b045..ff12b70 100644
--- a/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.horizontal.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF
index 1a7fef5..b728013 100644
--- a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.label.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.label.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.label.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml
index 9e56305..ae040ad 100644
--- a/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.label.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.label.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF
index 203efea..f452e35 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml
index 778bfd3..a97c021 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF
index 413596d..d74a1be 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.model.editor German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml
index a6769a8..9f89cb6 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.model.editor.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.editor.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF
index 099fd4a..3143ba7 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.model.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.model German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml
index a023402..c900e33 100644
--- a/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.model.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF
index a05789d..4861ca3 100644
--- a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.rule.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml
index 9e4dc36..f18831b 100644
--- a/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.rule.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.rule.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF
index 72fa8b0..f320add 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.table.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml
index 8c504ee..0ef0296 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF
index 88411db..0a0dc6a 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.table.model German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml
index 107747d..f31e71a 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.model.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.model.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF
index d0b35ae..a945279 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Nebula Grid Table UI German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.22.0,1.23.0)"
-Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.23.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.ecp.view.spi.table.nebula.grid.messages;version="1.22.0"
+Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml
index ec5637c..99dd4fb 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF
index f816ca7..850ba2a 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table UI SWT German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: OSGI-INF/l10n/bundle
+Export-Package: org.eclipse.emf.ecp.view.spi.table.swt;version="1.23.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt.nl_de
-Export-Package: org.eclipse.emf.ecp.view.spi.table.swt;version="1.22.0"
diff --git a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml
index 57e6eb1..2ca41b7 100644
--- a/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.table.ui.swt.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.ui.swt.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF
index a41f8f6..feffbbd 100644
--- a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.template.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.template.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml
index 47559db..1488af5 100644
--- a/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.template.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.template.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF
index d21fb4e..453c7f5 100644
--- a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.treemasterdetail.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml
index 1044389..94919ae 100644
--- a/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.treemasterdetail.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF
index 081ee78..7bf7f63 100644
--- a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF
+++ b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.view.vertical.model.edit German NLS Support
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model.edit.nl_de;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.model.edit;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.model.edit;bundle-version="[1.23.0,1.24.0)"
diff --git a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml
index a99163f..e0eb221 100644
--- a/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml
+++ b/i18n/org.eclipse.emf.ecp.view.vertical.model.edit.nl_de/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.i18n/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.vertical.model.edit.nl_de</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 edcc2ee..648be06 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.22.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.23.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.emf.ecp.application.e3/icons/eclipse_lg.gif"/>
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 100cf18..fb975fd 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.22.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.23.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 3f638d6..3bea12a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 fe71f13..a9daa15 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Parent for the rap product. Needed to reduce environments.
@@ -18,7 +18,9 @@
</properties>
<modules>
- <module>../../releng/_target</module>
+ <module>../org.eclipse.emf.ecp.target.rap</module>
+ <module>../org.eclipse.emf.ecp.target.rcp</module>
+ <module>../org.eclipse.emf.ecp.rap.products</module>
</modules>
<build>
diff --git a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
index 5a7ecaf..00ee640 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
+++ b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="ECP Rap Demo" uid="org.eclipse.emf.ecp.rap.demo" version="1.10.0" useFeatures="false" includeLaunchers="false">
+<product name="ECP Rap Demo" uid="org.eclipse.emf.ecp.rap.demo" version="1.23.0.qualifier" useFeatures="false" includeLaunchers="false">
<aboutInfo>
<image path="icons/eclipse_lg.gif"/>
@@ -39,7 +39,6 @@
<plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.i18n"/>
<plugin id="org.apache.batik.util"/>
- <plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.commons.codec"/>
<plugin id="org.apache.commons.fileupload"/>
<plugin id="org.apache.commons.io"/>
diff --git a/releng/org.eclipse.emf.ecp.rap.products/pom.xml b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
index 55a1760..999fb76 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2377050..cfcda65 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
index b949bc9..f59d315 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6e0c66c..d224d61 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml b/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml
index 9df492f..e6d9369 100644
--- a/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.i18n/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-i18n-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- modules -->
diff --git a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
index d2c3dbf..98e5282 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
@@ -234,7 +234,9 @@
<!-- EMF2Web -->
<module>../../tests/org.eclipse.emf.ecp.emf2web.json.test</module>
-
+
+ <!-- Data Templates -->
+ <module>../../tests/org.eclipse.emfforms.datatemplate.model.tests</module>
<module>../../tests/org.eclipse.emfforms.datatemplate.tooling.tests</module>
<module>../../tests/org.eclipse.emfforms.editor.test</module>
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index dbe740f..44b4b2f 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>1.2.0</tycho-version>
<tycho-extras-version>1.2.0</tycho-extras-version>
<javadoc-version>2.10.3</javadoc-version>
- <ecp-version>1.22.0</ecp-version>
+ <ecp-version>1.23.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 8c9cffa..dd8dc43 100644
--- a/releng/org.eclipse.emf.ecp.repository.target/category.xml
+++ b/releng/org.eclipse.emf.ecp.repository.target/category.xml
@@ -186,7 +186,7 @@
<feature id="org.eclipse.emfforms.editor.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
- <feature id="org.eclipse.emf.ecp.emf2web.feature" version="0.0.0">
+ <feature id="org.eclipse.emf.ecp.emf2web.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.jsonforms"/>
</feature>
<feature id="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature.source" version="0.0.0">
@@ -225,7 +225,13 @@
<feature id="org.eclipse.emf.ecp.view.groupedgrid.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
- <bundle id="org.eclipse.emf.ecp.view.table.validation" version="1.22.0.qualifier">
+ <feature id="org.eclipse.emf.ecp.ecore.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.ide"/>
+ </feature>
+ <feature id="org.eclipse.emf.ecp.ecore.editor.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.ide"/>
+ </feature>
+ <bundle id="org.eclipse.emf.ecp.view.table.validation.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</bundle>
<category-def name="org.eclipse.emf.ecp.sdk" label="All SDKs (install one of these)">
diff --git a/releng/org.eclipse.emf.ecp.repository.target/pom.xml b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
index 2f5a2d5..710a5f8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/releng/org.eclipse.emf.ecp.repository/category.xml b/releng/org.eclipse.emf.ecp.repository/category.xml
index 0152c2a..6099023 100644
--- a/releng/org.eclipse.emf.ecp.repository/category.xml
+++ b/releng/org.eclipse.emf.ecp.repository/category.xml
@@ -165,7 +165,7 @@
<feature id="org.eclipse.emfforms.editor.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
- <feature id="org.eclipse.emf.ecp.emf2web.feature" version="0.0.0">
+ <feature id="org.eclipse.emf.ecp.emf2web.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.jsonforms"/>
</feature>
<feature id="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature.source" version="0.0.0">
@@ -204,6 +204,12 @@
<feature id="org.eclipse.emf.ecp.view.groupedgrid.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
+ <feature id="org.eclipse.emf.ecp.ecore.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.ide"/>
+ </feature>
+ <feature id="org.eclipse.emf.ecp.ecore.editor.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.ide"/>
+ </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 aa7ed22..91b4aea 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
index 6479e62..27568df 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP" sequenceNumber="1561974009">
+<target name="ECP RAP" sequenceNumber="1569235684">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.13"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
@@ -23,8 +23,6 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.2.4.v201311231704"/>
<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -66,7 +64,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2019-06"/>
+ <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+ <repository location="http://download.eclipse.org/releases/2019-09"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
index b5d52b3..488f1d2 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.tpd
@@ -4,7 +4,7 @@
include "../org.eclipse.emf.ecp.target.rcp/ecp.tpd"
-location "http://download.eclipse.org/releases/2019-06" {
+location "http://download.eclipse.org/releases/2019-09" {
org.eclipse.rap.equinox.target.feature.feature.group lazy
org.eclipse.rap.feature.feature.group lazy
org.eclipse.rap.sdk.feature.feature.group lazy
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 ee68450..d107755 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="ECP RAP with ECP" sequenceNumber="1564757067">
+<target name="ECP RAP with ECP" sequenceNumber="1571918636">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.13"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
@@ -23,8 +23,6 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.2.4.v201311231704"/>
<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -66,7 +64,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2019-06"/>
+ <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+ <repository location="http://download.eclipse.org/releases/2019-09"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.ui.rap.feature.feature.group" version="0.0.0"/>
@@ -82,7 +81,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_122"/>
+ <repository location="http://download.eclipse.org/ecp/releases/releases_target_123"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd
index 3070a3e..aa76cc9 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.tpd
@@ -4,7 +4,7 @@
include "ecpRAP.tpd"
-location "http://download.eclipse.org/ecp/releases/releases_target_122"{
+location "http://download.eclipse.org/ecp/releases/releases_target_123"{
org.eclipse.emf.ecp.rap.sdk.feature.feature.group lazy
org.eclipse.emf.ecp.rap.util.feature.feature.group lazy
org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group lazy
diff --git a/releng/org.eclipse.emf.ecp.target.rap/pom.xml b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
index 629e924..195310b 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
@@ -5,11 +5,10 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecpRAP</artifactId>
- <version>1.22.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 a19dead..78a5ce3 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde?><!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --><target name="ECP RCP" sequenceNumber="1561974009">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="ECP RCP" sequenceNumber="1569235533">
<locations>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
@@ -8,12 +11,12 @@
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.13"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.0.0"/>
@@ -22,15 +25,13 @@
<unit id="org.eclipse.emf.emfstore.server.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">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
<repository location="http://build.eclipse.org/rt/rap/base-platforms/3.1/extra-dependencies/"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.2.4.v201311231704"/>
<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -44,16 +45,16 @@
<unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.edapt.runtime.feature.source.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/edapt/releases/14x"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/nebula/releases/latest"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
@@ -68,7 +69,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2019-06"/>
+ <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+ <repository location="http://download.eclipse.org/releases/2019-09"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
index fb44686..ccfb155 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
@@ -10,7 +10,7 @@
org.eclipse.swtbot.feature.group lazy
}
-location "http://download.eclipse.org/eclipse/updates/4.12" {
+location "http://download.eclipse.org/eclipse/updates/4.13" {
org.eclipse.equinox.sdk.feature.group lazy
org.eclipse.platform.ide lazy
}
@@ -31,8 +31,6 @@
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/" {
com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704]
com.google.gson.source [2.2.4.v201311231704,2.2.4.v201311231704]
- com.google.guava [21.0.0,22.0.0)
- com.google.guava.source [21.0.0,22.0.0)
javax.validation [1.0.0.GA_v201205091237,1.0.0.GA_v201205091237]
javax.validation.source [1.0.0.GA_v201205091237,1.0.0.GA_v201205091237]
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
@@ -55,7 +53,7 @@
org.eclipse.nebula.widgets.grid.feature.feature.group lazy
}
-location "http://download.eclipse.org/releases/2019-06" {
+location "http://download.eclipse.org/releases/2019-09" {
org.eclipse.emf.cdo.sdk.feature.group lazy
org.eclipse.emf.sdk.feature.group lazy
org.eclipse.emf.transaction.sdk.feature.group lazy
@@ -70,6 +68,7 @@
org.eclipse.xpand.sdk.feature.group lazy
org.eclipse.xtend.sdk.feature.group lazy
org.eclipse.xtext.sdk.feature.group lazy
+ com.google.guava [27.1.0,28.0.0)
}
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
index 73e841b29..c107ebe 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
@@ -5,11 +5,10 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp</artifactId>
- <version>1.22.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 0e416bd..55d6d17 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
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="emfforms_spreadsheet" sequenceNumber="1561974016">
+<target name="emfforms_spreadsheet" sequenceNumber="1569235704">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -14,7 +14,7 @@
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.13"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
@@ -53,7 +53,8 @@
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2019-06"/>
+ <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+ <repository location="http://download.eclipse.org/releases/2019-09"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.apache.commons.codec" version="0.0.0"/>
@@ -61,8 +62,6 @@
<unit id="org.apache.poi.source" version="0.0.0"/>
<unit id="com.google.gson" version="2.2.4.v201311231704"/>
<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
- <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
- <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
diff --git a/tests/ECPQ7Tests/EPPTests/download.sh b/tests/ECPQ7Tests/EPPTests/download.sh
index fc7d726..eaf2fcd 100755
--- a/tests/ECPQ7Tests/EPPTests/download.sh
+++ b/tests/ECPQ7Tests/EPPTests/download.sh
@@ -2,7 +2,7 @@
exit
fi
AUT_DIR="$1/aut"
-rm -rf ${AUT_DIR}/*
+#rm -rf ${AUT_DIR}/*
mkdir -p ${AUT_DIR}
cd ${AUT_DIR}
wget -O $2_$3.tar.gz https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/$2/$3/eclipse-committers-$2-$3-linux-gtk-x86_64.tar.gz\&r=1 --proxy=off
diff --git a/tests/ECPQ7Tests/EPPTests/pom.xml b/tests/ECPQ7Tests/EPPTests/pom.xml
index 8a5d6a2..b1d6d20 100644
--- a/tests/ECPQ7Tests/EPPTests/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/pom.xml
@@ -24,7 +24,7 @@
</profiles>
<properties>
<emfstore-update-site>http://download.eclipse.org/emfstore/releases_19</emfstore-update-site>
- <aut-path>/home/data/httpd/download.eclipse.org/ecp</aut-path>
+ <aut-path>.</aut-path>
</properties>
<build>
<pluginManagement>
@@ -85,6 +85,8 @@
<feature>org.eclipse.emf.ecp.sdk.feature.feature.group</feature>
<feature>org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group</feature>
<feature>org.eclipse.emfforms.view.annotation.feature.feature.group</feature>
+ <feature>org.eclipse.emfforms.datatemplate.ide.feature.feature.group</feature>
+ <feature>org.eclipse.emfforms.datatemplate.feature.feature.group</feature>
</features>
</injection>
<injection>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test b/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test
new file mode 100644
index 0000000..4c77555
--- /dev/null
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/DataTemplateEditor Smoke.test
@@ -0,0 +1,105 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _ihvnUC3mEeSwhO5Nwx0hPg,_ih4KMC3mEeSwhO5Nwx0hPg,_D4Pj4C3lEeSwhO5Nwx0hPg
+Element-Name: DataTemplateEditor Smoke
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference:
+Id: _XogaUM-8EemDG-PUFK2qgQ
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:57 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.viewmodel" | get-menu
+ -path "New/Other..." | click
+with [get-window New] {
+ get-tree | select "EMF Forms/DataTemplate"
+ get-button "Next >" | click
+}
+with [get-window -class WizardDialog] {
+ get-editbox -after [get-label "File name:"] | set-text "test.datatemplate"
+ get-button Finish | click
+}
+with [get-editor "test.datatemplate"] {
+ get-tree | select "Template Collection" | get-menu -path Template | click
+ get-button "Create and link new Instance" | click
+}
+get-window "Select Sub Class and Template" | get-tree | select "template/ViewTemplate" | double-click
+with [get-editor "test.datatemplate"] {
+ get-tree | select "Template Collection/Template/View Template" | get-menu -path Style | click
+ get-button "Link Style Property" | click
+}
+get-window "Select Elements" | get-table | get-property itemCount | equals 0 | verify-true
+get-window "Select Elements" | get-button Cancel | click
+get-editor "test.datatemplate" | get-button "Create and link new Style Property" | click
+with [get-window "Select Sub Class and Template"] {
+ get-tree | select "fontProperties/FontPropertiesStyleProperty"
+ get-button Finish | click
+}
+get-window FontPropertiesStyleProperty | get-button OK | click
+with [get-editor "test.datatemplate"] {
+ get-tree | select "Template Collection/Template/View Template" | get-menu -path Style | click
+ get-button "Link Style Property" | click
+}
+get-window "Select Elements" | get-table | get-property itemCount | equals 1 | verify-true
+get-window "Select Elements" | get-button Cancel | click
+get-editor "test.datatemplate" | get-button "Create and link new Style Property" | click
+with [get-window "Select Sub Class and Template"] {
+ get-tree | select "tableValidation/TableValidationStyleProperty"
+ get-button Finish | click
+}
+with [get-window TableValidationStyleProperty] {
+ get-editbox -after [get-label "Column Width"] | set-focus
+ get-button Cancel | click
+}
+with [get-editor "test.datatemplate"] {
+ get-tree | select "Template Collection" | get-menu -path Template | click
+ get-button "Create and link new Instance" | click
+}
+with [get-window "Select Sub Class and Template"] {
+ get-tree | select "template/ViewTemplate"
+ get-button Finish | click
+}
+with [get-editor "test.datatemplate"] {
+ get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 1 | get-item
+ -path "View Template"] | get-menu -path Style | click
+ get-button "Link Style Property" | click
+}
+get-window "Select Elements" | get-table | get-property itemCount | equals 0 | verify-true
+get-window "Select Elements" | get-button Cancel | click
+with [get-editor "test.datatemplate"] {
+ get-tree | select "Template Collection" | get-menu -path Template | click
+ get-button "Create and link new Instance" | click
+}
+get-window "Select Sub Class and Template" | get-tree | select "bowling/League" | double-click
+with [get-editor "test.datatemplate"] {
+ get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2 | get-item -path League]
+ get-button "Add an instance of Player" | click
+ get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2]
+ get-button "Delete Reference" | click
+}
+get-window Confirmation | get-button Yes | click
+get-editor "test.datatemplate" | get-tree | get-item -path "Template Collection" | get-item -path Template -index 2
+ | get-property childCount | equals 0 | verify-true
+with [get-editor "test.datatemplate"] {
+ get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2]
+ get-button "Create and link new Instance" | click
+}
+with [get-window "Select Sub Class and Template"] {
+ get-tree | select "bowling/Fan"
+ get-button Finish | click
+}
+with [get-editor "test.datatemplate"] {
+ get-tree | select [get-item -path "Template Collection" | get-item -path Template -index 2 | get-item -path Fan]
+ get-button "Create and link new Tournament" | click
+}
+get-window "Cannot create element"
+ | get-label "Cannot add new objects to non-containment references in a template."
+ | get-property caption
+ | equals "Cannot add new objects to non-containment references in a template." | verify-true
+get-window "Cannot create element" | get-button OK | click
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
index 7e7859a..7de1451 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
@@ -130,7 +130,7 @@
get-editbox -after [get-label "Last Name*"] | get-property text | equals "" | verify-true
with [get-label "" -after [get-label "Last Name*"]] {
get-property backgroundColor | equals "#FFFFFF" | verify-true
- get-property "image.path" | equals "org.eclipse.emf.ecp.edit.swt/icons/validation_error.png" | verify-true
+ get-property "image.path" | equals "org.eclipse.emfforms.swt.core/icons/validation_error.png" | verify-true
}
}
with [get-view "EMF Forms Preview"] {
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
index 5723f0a..605dc54 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TableSubTypeSupport.test
@@ -1,13 +1,13 @@
--- RCPTT testcase ---
Format-Version: 1.0
-Contexts: _ZOi4wZ77EeOm87IlbkWrfQ,_ihvnUC3mEeSwhO5Nwx0hPg
+Contexts: _ZOi4wZ77EeOm87IlbkWrfQ,_Iu0EsS36EeSYRYqCbC6LMQ
Element-Name: TableSubTypeSupport
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _uDtLYDnOEeiT54i24ck9dw
Runtime-Version: 2.4.2.201905052359
-Save-Time: 5/6/19 3:00 PM
+Save-Time: 10/5/19 9:54 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -71,12 +71,12 @@
//get-view "EMF Forms Preview" | get-button "Refresh Preview View" | click
get-view "EMF Forms Preview" | get-table | get-property "getColumnCount()" | equals 19 | verify-true
get-view "EMF Forms Preview" | get-button "Add an instance of EStructuralFeature" | click
-with [get-window "New Reference Element" | get-tree] {
+with [get-window "Select Sub Class and Template" | get-tree] {
get-property itemCount | equals 2 | verify-true
get-property "getItems().TreeItem[0].getText()" | equals EAttribute | verify-true
get-property "getItems().TreeItem[1].getText()" | equals EReference | verify-true
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select EAttribute
get-button Finish | click
}
@@ -136,7 +136,7 @@
}
get-button "Add an instance of EStructuralFeature" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select EReference
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
index 37d8d95..5ff71c2 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAndSelector.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _uCoUgDmmEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:30 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:57 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,19 +18,19 @@
get-tree | select "View Template" | get-menu -path Style | click
get-button "Create and link new Selector" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select "bool/AndSelector"
get-button Finish | click
}
with [get-window AndSelector] {
get-button "Create and link new Style Selector" | click
- with [get-window "New Reference Element"] {
+ with [get-window "Select Sub Class and Template"] {
get-tree | select "viewModelElement/ViewModelElementSelector"
get-button Finish | click
}
get-window ViewModelElementSelector | get-button OK | click
get-button "Create and link new Style Selector" | click
- with [get-window "New Reference Element"] {
+ with [get-window "Select Sub Class and Template"] {
get-tree | select "annotation/AnnotationSelector"
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
index ed7e959..d518aea 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateAnnotationSelector.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _PcpI0DmJEeiUsKIXZxWPjg
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:22 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,7 +18,7 @@
get-tree | select "View Template" | get-menu -path Style | click
get-button "Create and link new Selector" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select "annotation/AnnotationSelector"
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
index b0edb24..f01f801 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_OpenFromHistory.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _-p_yMKoHEeminf0o9fO9mA
-Runtime-Version: 2.5.0.201907120000
-Save-Time: 7/19/19 2:44 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -25,7 +25,7 @@
get-tree | select "View Template" | get-menu -path Style | click
get-button "Create and link new Style Property" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select "mandatory/MandatoryStyleProperty"
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
index 58db264..c90c19a 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateEditor_Reload.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _6KV0MKoAEeminf0o9fO9mA
-Runtime-Version: 2.5.0.201907120000
-Save-Time: 7/19/19 2:44 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
Testcase-Type: ecl
------=_.description-216f885c-d591-38ce-8ea2-e4f8cb4d6ffa
@@ -24,7 +24,7 @@
get-tree | select "View Template" | get-menu -path Style | click
get-button "Create and link new Style Property" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select "mandatory/MandatoryStyleProperty"
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
index 950f0d7..ef02657 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateHierarchySelector.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _JU4aMDmmEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:26 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,13 +18,13 @@
get-tree | select "View Template" | get-menu -path Style | click
get-button "Create and link new Selector" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select "hierarchy/HierarchySelector"
get-button Finish | click
}
with [get-window HierarchySelector] {
get-button "Create and link new Selector" | click
- with [get-window "New Reference Element"] {
+ with [get-window "Select Sub Class and Template"] {
get-tree | select "viewModelElement/ViewModelElementSelector"
get-button Finish | click
}
@@ -46,7 +46,7 @@
}
get-button "Create and link new Selector" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select "viewModelElement/ViewModelElementSelector"
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
index ee3a51f..c451da5 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TemplateLabelWrapStyle.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _RKICsDmnEeiV5MMKft7xVA
-Runtime-Version: 2.3.0.201804052311
-Save-Time: 4/6/18 4:33 PM
+Runtime-Version: 2.4.2.201905052359
+Save-Time: 10/5/19 9:56 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -18,7 +18,7 @@
get-tree | select "View Template" | get-menu -path Style | click
get-button "Create and link new Style Property" | click
}
-with [get-window "New Reference Element"] {
+with [get-window "Select Sub Class and Template"] {
get-tree | select "wrap/LabelWrapStyleProperty"
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test b/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test
index 8aa2cac..f3934bc 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/TreeMasterDetailSmokeTest.test
@@ -118,7 +118,7 @@
get-editbox -after [get-label "First Name"] | get-property "getText()" | equals "" | verify-true
get-editbox -after [get-label "Last Name*"] | get-property "getText()" | equals "" | verify-true
get-label "" -after [get-label "Last Name*"] | get-property "image.path"
- | equals "org.eclipse.emf.ecp.edit.swt/icons/validation_error.png" | verify-true
+ | equals "org.eclipse.emfforms.swt.core/icons/validation_error.png" | verify-true
get-combo -after [get-label Gender] | get-property selection | equals Male | verify-true
}
//change user1 details
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test b/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test
index 03fdc76..66b745c 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/View Model With Abstract Root EClass.test
@@ -54,7 +54,7 @@
// Check that controls are present and that validation works
get-view "EMF Forms Preview" | get-label "Name*" | get-property caption | equals "Name*" | verify-true
get-view "EMF Forms Preview" | get-label "" -after [get-label "Name*"] | get-property "image.path"
- | equals "org.eclipse.emf.ecp.edit.swt/icons/validation_error.png" | verify-true
+ | equals "org.eclipse.emfforms.swt.core/icons/validation_error.png" | verify-true
with [get-view "EMF Forms Preview" | get-editbox -after [get-label "Name*"]] {
set-text Test
key-type "TRAVERSE_TAB_NEXT"
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
index b9302d9..b1f46c5 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
@@ -299,9 +299,9 @@
get-editor "User.view" | get-tree | select View | get-menu -path Control | click
with [get-editor "User.view" | get-tree] {
get-item -path "View/Control" | get-property "image.decorations[0].path"
- | equals "org.eclipse.emf.ecp.edit.swt/icons/error_decorate.png" | verify-true
+ | equals "org.eclipse.emfforms.swt.core/icons/error_decorate.png" | verify-true
get-item -path View | get-property "image.decorations[0].path"
- | equals "org.eclipse.emf.ecp.edit.swt/icons/error_decorate.png" | verify-true
+ | equals "org.eclipse.emfforms.swt.core/icons/error_decorate.png" | verify-true
}
get-editor "User.view" | get-tree | select "View/Control" | get-menu -path Delete | click
verify-error { get-editor "User.view" | get-tree | get-item -path View | get-property "image.decorations[0].path" -raw}
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 22563c5..085bf1c 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Change Broker EMFStore Provider Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.changebroker.provider.test
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 17af4e1..61a48cd 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 e212cbf..4b18967 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Change Broker Test
Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.23.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 05c2ae8..dabdb7e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 a7f4e21..ca2d440 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.common.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.22.0",
- org.eclipse.emf.ecp.common.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.23.0",
+ org.eclipse.emf.ecp.common.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.util;version="1.23.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 75a0b40..5e321ad 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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.common.ui.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
index 2a6a8a2..9ca58e8 100644
--- a/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.common.ui.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Common UI Test
Bundle-SymbolicName: org.eclipse.emf.ecp.common.ui.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.spi.common.ui.composites;version="1.23.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml b/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
index 1b31afa..7d08417 100644
--- a/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.common.ui.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.ui.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 c883937..35057c2 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,12 +5,12 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.test.fx;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.22.0,1.23.0)",
+Require-Bundle: org.eclipse.emf.ecp.controls.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.test.fx;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.fx;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.controls.fx.test
diff --git a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
index 9dc1058..dcf6d05 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core RAP Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.concurrent.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.concurrent.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.concurrent.test;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,1.10.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.equinox.ds
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.concurrent.test
Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.internal.ui;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.internal.ui;version="[1.23.0,1.24.0)",
org.osgi.framework;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
index ac8f8b3..cae1a4c 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.concurrent.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.concurrent.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
index e61db96..871f78c 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core Rap Sessionprovider Concurrent Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/component.xml
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
index c2bd8db..987a168 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.concurrent.test</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
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 e165b18..b69b182 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core Rap Sessionprovider Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/component.xml
Bundle-ActivationPolicy: lazy
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 6a03df5..bccb8b3 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f7df72e..5eb6c30 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core RAP Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.core.rap.test
Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.23.0,1.24.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 174c62c..0f0cfe9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 cc9a60d..d78218d 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.core.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.core.test;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="4.0.0",
org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.core.test/pom.xml b/tests/org.eclipse.emf.ecp.core.test/pom.xml
index 4482786..c436dd6 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c5bf6a0..aeaf131 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Diff Merge Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.diffmerge.test
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
index f80836e..ea9db96 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1d58a9f..3a75d55 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECore GenModel Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ecore.editor.test
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 65fcf11..a143f57 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 67a1ac0..dd93af6 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,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.edit.internal.model.testData;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.model.testData.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.model.testData.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.table;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.internal.swt.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.edit.internal.model.testData;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.model.testData.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.model.testData.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.table;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.23.0"
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.prevalidation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.8.0,3.0.0)"
-Automatic-Module-Name: org.eclipse.emf.ecp.edit.swt.test
-Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.22.0,1.23.0)"
+Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.ecp.edit.swt.test
+Import-Package: org.eclipse.emf.ecp.view.test.common.swt.spi;version="[1.23.0,1.24.0)"
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 2354fdf..e6a5c43 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/DeleteServiceAdapter_PTest.java b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/DeleteServiceAdapter_PTest.java
new file mode 100644
index 0000000..b249e5f
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/DeleteServiceAdapter_PTest.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Christian W. Damus and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Christian W. Damus - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.internal.swt.util;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.verify;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.eclipse.emf.ecp.edit.spi.DeleteService;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
+import org.eclipse.emf.emfstore.bowling.BowlingFactory;
+import org.eclipse.emf.emfstore.bowling.League;
+import org.eclipse.emf.emfstore.bowling.Player;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+/**
+ * Tests for the {@code DeleteServiceAdapter} class via the {@link ConditionalDeleteService} APIs that provide instances of it.
+ */
+@SuppressWarnings("nls")
+@RunWith(MockitoJUnitRunner.class)
+public class DeleteServiceAdapter_PTest {
+
+ private League league;
+ private Player player;
+
+ @Mock
+ private DeleteService delegate;
+
+ @Mock
+ private ConditionalDeleteService cdelegate;
+
+ /**
+ * Test the null adapter (the adapter for an absent delete service).
+ */
+ @Test
+ public void test_canDelete_null() {
+ final ConditionalDeleteService service = ConditionalDeleteService.adapt(null);
+
+ final Collection<?> objects = Arrays.asList(player, league);
+ assertThat("can delete without delegate", service.canDelete(player), is(false));
+ assertThat("can delete without delegate", service.canDelete(objects), is(false));
+ }
+
+ @Test
+ public void test_canDelete_single() {
+ final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+ assertThat(service.canDelete(player), is(true));
+ assertThat(service.canDelete(league), is(false));
+ }
+
+ @Test
+ public void test_canDelete_multiple() {
+ final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+ assertThat(service.canDelete(Arrays.asList(player)), is(true));
+ assertThat(service.canDelete(Arrays.asList(player, league)), is(false));
+ }
+
+ @Test
+ public void test_canDelete_single2() {
+ final ConditionalDeleteService service = ConditionalDeleteService.adapt(cdelegate);
+
+ service.canDelete(player);
+
+ verify(cdelegate).canDelete(player);
+ }
+
+ @Test
+ public void test_canDelete_multiple2() {
+ final ConditionalDeleteService service = ConditionalDeleteService.adapt(cdelegate);
+
+ final Collection<?> objects = Arrays.asList(player, league);
+ service.canDelete(objects);
+
+ verify(cdelegate).canDelete(objects);
+ }
+
+ @Test
+ public void test_deleteElement() {
+ final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+ service.deleteElement(player);
+
+ verify(delegate).deleteElement(player);
+ }
+
+ @Test
+ public void test_deleteElementse() {
+ final ConditionalDeleteService service = ConditionalDeleteService.adapt(delegate);
+
+ final Collection<Object> objects = Arrays.asList(player, league);
+ service.deleteElements(objects);
+
+ verify(delegate).deleteElements(objects);
+ }
+
+ //
+ // Test framework
+ //
+
+ @Before
+ public void createModel() {
+ league = BowlingFactory.eINSTANCE.createLeague();
+ player = BowlingFactory.eINSTANCE.createPlayer();
+
+ league.getPlayers().add(player);
+ }
+
+}
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java
index b3289f0..0344274 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/src/org/eclipse/emf/ecp/edit/internal/swt/util/EMFDeleteSerivceImpl_PTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,9 +10,12 @@
*
* Contributors:
* jfaltermeier - initial API and implementation
+ * Christian W. Damus - bug 552385
******************************************************************************/
package org.eclipse.emf.ecp.edit.internal.swt.util;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
@@ -21,19 +24,25 @@
import static org.mockito.Mockito.when;
import java.util.Arrays;
+import java.util.Collection;
import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
import org.eclipse.emf.common.util.URI;
+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.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.ecp.edit.spi.DeleteService;
+import org.eclipse.emf.ecp.edit.spi.ConditionalDeleteService;
import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
import org.eclipse.emf.ecp.test.university.Address;
import org.eclipse.emf.ecp.test.university.Professor;
import org.eclipse.emf.ecp.test.university.UniversityFactory;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.edit.command.OverrideableCommand;
+import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.emfstore.bowling.BowlingFactory;
@@ -48,10 +57,12 @@
* @author jfaltermeier
*
*/
+@SuppressWarnings("nls")
public class EMFDeleteSerivceImpl_PTest {
- private DeleteService deleteService;
+ private ConditionalDeleteService deleteService;
private AdapterFactoryEditingDomain domain;
+ private ViewModelContext context;
private Resource resource;
private League league;
private Game game;
@@ -60,13 +71,25 @@
private Player player3;
private Tournament tournament;
+ private EObject denyDeletion;
+
@Before
public void setUp() {
final ResourceSet resourceSet = new ResourceSetImpl();
resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl()); //$NON-NLS-1$
domain = new AdapterFactoryEditingDomain(
new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
- new BasicCommandStack(), resourceSet);
+ new BasicCommandStack(), resourceSet) {
+
+ @Override
+ public Command createOverrideCommand(OverrideableCommand command) {
+ if (denyDeletion != null && command instanceof RemoveCommand
+ && ((RemoveCommand) command).getCollection().contains(denyDeletion)) {
+ return UnexecutableCommand.INSTANCE;
+ }
+ return super.createOverrideCommand(command);
+ }
+ };
resourceSet.eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
resource = resourceSet.createResource(URI.createURI("VIRTUAL_URI")); //$NON-NLS-1$
@@ -91,7 +114,7 @@
game.setPlayer(player1);
deleteService = new EMFDeleteServiceImpl();
- final ViewModelContext context = mock(ViewModelContext.class);
+ context = mock(ViewModelContext.class);
when(context.getDomainModel()).thenReturn(league);
deleteService.instantiate(context);
}
@@ -143,4 +166,40 @@
assertSame(address1, professor.getAddresses().get(0));
}
+ @Test
+ public void testCanDeleteElement() {
+ assertThat("can delete returns false", deleteService.canDelete(player1), is(true));
+
+ denyDeletion = player1;
+ assertThat("can delete returns true", deleteService.canDelete(player1), is(false));
+ }
+
+ @Test
+ public void testCanDeleteElements() {
+ final Collection<?> objects = Arrays.asList(player1, player2);
+
+ assertThat("can delete returns false", deleteService.canDelete(objects), is(true));
+
+ denyDeletion = player2; // Not the first one
+ assertThat("can delete returns true", deleteService.canDelete(objects), is(false));
+ }
+
+ @Test
+ public void testCanDeleteNoEditingDomain() {
+ // Disconnect everything from the editing domain
+ resource.getContents().clear();
+ resource.getResourceSet().eAdapters().clear();
+ resource.getResourceSet().getResources().clear();
+ resource.unload();
+ resource.eAdapters().clear();
+
+ // Re-initialize to forget the editing domain
+ deleteService.dispose();
+ deleteService.instantiate(context);
+
+ assertThat("cannot delete a contained object", deleteService.canDelete(player1), is(true));
+
+ assertThat("can delete a root object", deleteService.canDelete(league), is(false));
+ }
+
}
diff --git a/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
index ee030a2..7773b0e 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.emf2web.json.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF To Web JSON Test
Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.json.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.22.0",
- org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.emf2web.json.controller.xtend;version="1.23.0",
+ org.eclipse.emf.ecp.emf2web.json.generator.xtend;version="1.23.0"
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.22.0,1.23.0)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.emf2web.json.test
diff --git a/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml b/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
index 12e9574..e3eb267 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.emf2web.json.test/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emf2web.json.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
index ed8db13..12310df 100644
--- a/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.editor.view.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: IDE Editor View Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ide.editor.view.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ide.editor.view.test;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.apache.log4j;bundle-version="[1.2.15,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ide.editor.view.test
diff --git a/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
index 7460a17..fca5a0f 100644
--- a/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.editor.view.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.editor.view.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 84d62e6..1c4538c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.23.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,11 +14,11 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,1.10.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ide.util.test
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 3df9ce9..868960b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 e57862b..c912c4c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: IDEViewModelRegistry Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.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 2335d12..a81fc1d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 a914fc8..8788bfe 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Integrationtest
Bundle-SymbolicName: org.eclipse.emf.ecp.integrationtest
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.integrationtest.Activator
-Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.23.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.8
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
index 82c2215..4adc15a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 35019c1..0b042b3 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Model Quick Fix Test
Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.23.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 696d978..06e92f8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b354dc0..634907e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Test Model Edit Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.test.model.edit;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.test.model.edit
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 c01c9f4..59512d0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6bc6053..4c2670a 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.22.0.qualifier">
+ version="1.23.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 78f82cd..1df1987 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 15d0ec8..50fa09a 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Test Model Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.test.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university;version="1.22.0",
- org.eclipse.emf.ecp.test.university.impl;version="1.22.0",
- org.eclipse.emf.ecp.test.university.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.test.university;version="1.23.0",
+ org.eclipse.emf.ecp.test.university.impl;version="1.23.0",
+ org.eclipse.emf.ecp.test.university.util;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.test.model
diff --git a/tests/org.eclipse.emf.ecp.test.model/pom.xml b/tests/org.eclipse.emf.ecp.test.model/pom.xml
index fd4b4ba..e567d40 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 56d8c13..0f74ef7 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation View Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.validation.test
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 18be6f7..3315b47 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
index 9fc91a8..0462c3d 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Editor Controls - Tests for Blocking UI
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
index dada50d..0637ca3 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.blockinguitests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.blockinguitests</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 f6fc898..3b425f9 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,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.22.0",
- org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.controls;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.editor.controls;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.23.0",
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.controls;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.23.0"
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.editor.controls.test
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 5ace925..f891c2c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 76f261d..615131d 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,10 +2,10 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.linewrapper.tests
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 48b50a5..2293316 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f9d5dbe..95c210d 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: SWT Renderer Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.spi.swt.layout;version="1.22.0";uses:="org.hamcrest",
- org.eclipse.emf.ecp.ui.view.spi.swt.masterdetail;version="1.22.0",
- org.eclipse.emf.ecp.ui.view.spi.swt.selection.test;version="1.22.0";uses:="org.hamcrest,org.eclipse.jface.viewers",
- org.eclipse.emf.ecp.ui.view.swt;version="1.22.0";
+Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.internal.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.spi.swt.layout;version="1.23.0";uses:="org.hamcrest",
+ org.eclipse.emf.ecp.ui.view.spi.swt.masterdetail;version="1.23.0",
+ org.eclipse.emf.ecp.ui.view.spi.swt.selection.test;version="1.23.0";uses:="org.hamcrest,org.eclipse.jface.viewers",
+ org.eclipse.emf.ecp.ui.view.swt;version="1.23.0";
uses:="org.eclipse.emf.ecore,
org.osgi.framework,
org.eclipse.swt.widgets,
org.eclipse.emf.ecore.resource,
org.eclipse.emf.ecp.ui.view.swt.reference",
- org.eclipse.emf.ecp.ui.view.swt.test;version="1.22.0";
+ org.eclipse.emf.ecp.ui.view.swt.test;version="1.23.0";
uses:="org.eclipse.emf.ecore,
org.eclipse.emf.ecp.ui.view.swt.reference,
org.eclipse.emf.common.notify,
@@ -23,15 +23,15 @@
org.eclipse.emf.edit.domain"
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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.swt.test
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)"
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 1fd89b7..ad6f67b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 5f555a9..6426e76 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.test
-Bundle-Version: 1.22.0.qualifier
-Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.23.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.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.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.ui.view.test
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 f32adc6..8e0f0cb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 af8c484..f8253fd 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Diagnostician Test
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.23.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.8
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 2e30ce0..d0e6ca5 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 25299bb..aaad4b9 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.validation.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.util;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.validation.test
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emf.ecp.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
index 2efb7ab..26f2317 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
index 2b9ed0d..41e2669 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the Categorization Model's Edit Bundle
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.model.edit.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.model.edit.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.23.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.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
index 5ac40a2..de767ba 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.categorization.model.edit.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.model.edit.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch
index 1a5edf0..3701fe3 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/CategorizationTests.launch
@@ -33,7 +33,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<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,org.apache.batik.constants*1.11.0.v20190515-0436@default:default,org.apache.batik.css*1.11.0.v20190515-0436@default:default,org.apache.batik.i18n*1.11.0.v20190515-0436@default:default,org.apache.batik.util*1.11.0.v20190515-0436@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@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@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,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.supplier@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.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@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@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.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@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.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.text@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.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_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.batik.constants*1.11.0.v20190515-0436@default:default,org.apache.batik.css*1.11.0.v20190515-0436@default:default,org.apache.batik.i18n*1.11.0.v20190515-0436@default:default,org.apache.batik.util*1.11.0.v20190515-0436@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@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@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,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.supplier@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.dialogs@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.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@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@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.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@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.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.text@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.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.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.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@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.categorization.model.edit@default:default,org.eclipse.emf.ecp.view.categorization.model@default:default,org.eclipse.emf.ecp.view.categorization.swt.test@default:false,org.eclipse.emf.ecp.view.categorization.swt@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.horizontal.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.di@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@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.model@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@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.domainexpander.default@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.segments@default:default,org.eclipse.emfforms.core.services.structuralchange.default@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@default:default,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.model.localization@default:default,org.eclipse.emfforms.view.multisegment.model@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
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 425d835..ecca981 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,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Categorization Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.categorization.swt.test
-Import-Package: org.eclipse.emf.ecp.test.common;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.test.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
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 a24eb7f..2876aaa 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java
index c7f6127..ae08028 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRenderer_PTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,14 +10,28 @@
*
* Contributors:
* Eugen - initial API and implementation
+ * Christian W. Damus - bug 552852
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.categorization.swt;
+import static java.util.Collections.singleton;
+import static org.eclipse.emf.ecp.view.test.common.spi.EMFMocking.eMock;
+import static org.hamcrest.CoreMatchers.anything;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.util.HashSet;
+import java.util.Set;
+
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.TreeIterator;
@@ -42,6 +56,7 @@
import org.eclipse.emf.emfstore.bowling.BowlingFactory;
import org.eclipse.emf.emfstore.bowling.Player;
import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.swt.core.EMFFormsNoRendererException;
import org.eclipse.emfforms.spi.swt.core.EMFFormsRendererFactory;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.swt.custom.CTabFolder;
@@ -52,7 +67,6 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,13 +77,6 @@
@RunWith(DatabindingClassRunner.class)
public class CategorizationRenderer_PTest {
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
@Test
public void testCategorizationElementTreeRenderer() throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption {
@@ -98,22 +105,30 @@
@Test
public void testCategorizationElementTabRenderer() throws NoRendererFoundException,
- NoPropertyDescriptorFoundExeption {
+ NoPropertyDescriptorFoundExeption, EMFFormsNoRendererException {
+
+ final Set<Object> contextUsers = new HashSet<>();
+
final ReportService reportService = mock(ReportService.class);
- final EMFFormsRendererFactory emfFormsRendererFactory = mock(EMFFormsRendererFactory.class);
+ final EMFFormsRendererFactory emfFormsRendererFactory = mockRendererFactory(reportService);
final SWTGridCell gridCell = mock(SWTGridCell.class);
final Shell shell = new Shell();
final VCategorizationElement categorizationElement = mock(VCategorizationElement.class);
final EList<VAbstractCategorization> categorizations = new BasicEList<VAbstractCategorization>();
+ categorizations.add(eMock(VCategory.class));
when(categorizationElement.getCategorizations()).thenReturn(categorizations);
- final ViewModelContext vmc = mock(ViewModelContext.class);
+ final ViewModelContext vmc = mockViewModelContext(contextUsers);
final VTViewTemplateProvider viewTemplateProvider = mock(VTViewTemplateProvider.class);
final CategorizationElementTabbedSWTRenderer categorizatrionElementRenderer = new CategorizationElementTabbedSWTRenderer(
categorizationElement, vmc, reportService, emfFormsRendererFactory, viewTemplateProvider);
categorizatrionElementRenderer.init();
final Control render = categorizatrionElementRenderer.render(gridCell, shell);
+ categorizatrionElementRenderer.finalizeRendering(shell);
assertTrue(CTabFolder.class.isInstance(render));
+
+ shell.dispose();
+ assertThat("Some context user remains", contextUsers, not(hasItem(anything())));
}
@Test
@@ -190,8 +205,11 @@
@Test
public void testCompositeCategoryElementTabRenderer() throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption {
+
+ final Set<Object> contextUsers = new HashSet<>();
+
final ReportService reportService = mock(ReportService.class);
- final EMFFormsRendererFactory emfFormsRendererFactory = mock(EMFFormsRendererFactory.class);
+ final EMFFormsRendererFactory emfFormsRendererFactory = mockRendererFactory(reportService);
final SWTGridCell gridCell = mock(SWTGridCell.class);
final Shell shell = new Shell();
@@ -199,15 +217,21 @@
final EList<VAbstractCategorization> categorizations = new BasicEList<VAbstractCategorization>();
final VCategorization categorization = mock(VCategorization.class);
categorizations.add(categorization);
- when(categorization.getCategorizations()).thenReturn(new BasicEList<VAbstractCategorization>());
+ final EList<VAbstractCategorization> tabs = new BasicEList<VAbstractCategorization>(
+ singleton(eMock(VCategory.class)));
+ when(categorization.getCategorizations()).thenReturn(tabs);
when(categorizationElement.getCategorizations()).thenReturn(categorizations);
- final ViewModelContext vmc = mock(ViewModelContext.class);
+ final ViewModelContext vmc = mockViewModelContext(contextUsers);
final VTViewTemplateProvider viewTemplateProvider = mock(VTViewTemplateProvider.class);
final CompositeCategorySWTTabRenderer categorizatrionElementRenderer = new CompositeCategorySWTTabRenderer(
categorization, vmc, reportService, emfFormsRendererFactory, viewTemplateProvider);
categorizatrionElementRenderer.init();
final Control render = categorizatrionElementRenderer.render(gridCell, shell);
+ categorizatrionElementRenderer.finalizeRendering(shell);
assertTrue(CTabFolder.class.isInstance(render));
+
+ shell.dispose();
+ assertThat("Some context user remains", contextUsers, not(hasItem(anything())));
}
@Test
@@ -276,4 +300,34 @@
assertTrue(tree.isEnabled());
assertTrue(detailComposite.isEnabled());
}
+
+ //
+ // Test framework
+ //
+
+ ViewModelContext mockViewModelContext(Set<Object> users) {
+ final ViewModelContext result = mock(ViewModelContext.class);
+ doAnswer(invocation -> users.add(invocation.getArguments()[0])).when(result).addContextUser(any());
+ doAnswer(invocation -> users.remove(invocation.getArguments()[0])).when(result).removeContextUser(any());
+ return result;
+ }
+
+ EMFFormsRendererFactory mockRendererFactory(ReportService reportService) {
+ final EMFFormsRendererFactory result = mock(EMFFormsRendererFactory.class);
+ try {
+ when(result.getRendererInstance(isA(VCategory.class), any()))
+ .thenAnswer(invocation -> {
+ final SWTCategoryRenderer renderer = new SWTCategoryRenderer(
+ (VCategory) invocation.getArguments()[0],
+ (ViewModelContext) invocation.getArguments()[1], reportService, result);
+ renderer.init();
+ return renderer;
+ });
+ } catch (final EMFFormsNoRendererException e) {
+ e.printStackTrace();
+ fail("Exception in mock set-up: " + e.getMessage());
+ }
+
+ return result;
+ }
}
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java
index 1170953..1ed1106 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/src/org/eclipse/emf/ecp/view/spi/categorization/swt/CategorizationRevealProvider_PTest.java
@@ -13,16 +13,21 @@
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.categorization.swt;
+import static org.eclipse.emf.ecp.common.spi.UniqueSetting.createSetting;
import static org.eclipse.emf.ecp.view.test.common.spi.EMFMocking.eMock;
import static org.eclipse.emf.ecp.view.test.common.spi.EMFMocking.withESettings;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecp.test.common.DefaultRealm;
import org.eclipse.emf.ecp.view.internal.categorization.swt.CategorizationRevealProvider;
import org.eclipse.emf.ecp.view.spi.categorization.model.VCategorization;
@@ -32,7 +37,11 @@
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.model.VContainedContainer;
import org.eclipse.emf.ecp.view.spi.model.VContainer;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
+import org.eclipse.emf.ecp.view.spi.vertical.model.VVerticalFactory;
+import org.eclipse.emf.ecp.view.spi.vertical.model.VVerticalLayout;
import org.eclipse.emf.ecp.view.test.common.spi.EMFFormsRevealServiceFixture;
import org.eclipse.emf.ecp.view.test.common.spi.EMFFormsViewContextFixture.DomainModel;
import org.eclipse.emf.ecp.view.test.common.spi.EMFFormsViewContextFixture.ViewModel;
@@ -41,6 +50,7 @@
import org.eclipse.emf.ecp.view.test.common.swt.spi.SWTViewTestHelper;
import org.eclipse.emfforms.bazaar.Bid;
import org.eclipse.emfforms.bazaar.Create;
+import org.eclipse.emfforms.spi.core.services.controlmapper.EMFFormsSettingToControlMapper;
import org.eclipse.emfforms.spi.core.services.reveal.EMFFormsRevealProvider;
import org.eclipse.emfforms.spi.core.services.reveal.RevealStep;
import org.eclipse.swt.widgets.Shell;
@@ -61,9 +71,8 @@
private final VCategorizationElement categorizations = VCategorizationFactory.eINSTANCE
.createCategorizationElement();
- @EMock
@DomainModel
- private EObject rootObject;
+ private final EObject rootObject = EcoreFactory.eINSTANCE.createEClass();
@EMock
private EObject obj1;
@@ -192,6 +201,40 @@
verify(reveal).run();
}
+ /**
+ * Integration test for revealing a specific control (by feature) within a tree categorization,
+ * which is the scenario that didn't work as reported in <a href="http://eclip.se/551066">bug 551066</a>.
+ * The test relies on the fact that the non-default category containing the control to be revealed
+ * would not end up being selected if the control within did not provide a successful reveal step.
+ *
+ * @see <a href="http://eclip.se/551066">bug 551066</a>
+ */
+ @Test
+ public void revealSpecificControlInTree() {
+ final VVerticalLayout vertical = VVerticalFactory.eINSTANCE.createVerticalLayout();
+ cat3.setComposite(vertical);
+
+ final VControl control = VViewFactory.eINSTANCE.createControl();
+ final EStructuralFeature feature = EcorePackage.Literals.ENAMED_ELEMENT__NAME;
+ control.setDomainModelReference(feature);
+ vertical.getChildren().add(control);
+
+ // Revealing a control requires the settings mapper
+ final EMFFormsSettingToControlMapper mapper = mock(EMFFormsSettingToControlMapper.class);
+ when(mapper.hasControlsFor(rootObject)).thenReturn(true);
+ when(mapper.hasMapping(createSetting(rootObject, feature), control)).thenReturn(true);
+ fixture.putService(EMFFormsSettingToControlMapper.class, mapper);
+
+ render();
+
+ fixture.reveal(rootObject, feature);
+
+ // The category would only be selected if the control within it was revealed.
+ // In the case of bug 551066, context injection of the ControlRevealProvider failed
+ // to create the provider because the name control renderer was not yet available
+ assertThat("The category was not selected", categorizations.getCurrentSelection(), is(cat3));
+ }
+
//
// Test framework
//
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 c9c2138..4077659 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Compound Control SWT Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
Import-Package: org.eclipse.swt.graphics;version="0.0.0",
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 cfad571..efee2f0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 bae8d5b..2f2de66 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms View Model Context Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.context;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.context;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.context.tests
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 68d0cf8..b0274c0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch
index 07c47aa..5b8ea3a 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/AllPluginTests for view.control.multireference.launch
@@ -24,6 +24,7 @@
<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"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<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.8"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.ecp.view.control.multireference.tests.AllPluginTests"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
@@ -32,8 +33,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<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,org.apache.batik.constants@default:default,org.apache.batik.css*1.10.0.v20180703-1553@default:default,org.apache.batik.i18n@default:default,org.apache.batik.util*1.10.0.v20180703-1553@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding*1.7.100.v20181030-1443@default:default,org.eclipse.core.databinding.observable*1.6.300.v20180827-2028@default:default,org.eclipse.core.databinding.property*1.6.300.v20180827-2028@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.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.supplier@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.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.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@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@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.event@default:default,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.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.util@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*1.3.0.v201303031735@default:default,org.hamcrest.core*1.3.0.v20180420-1519@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.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.control.multireference.tests@default:false,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.migrator@default:default,org.eclipse.emf.ecp.view.model.common@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.model.test@default:false,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.template.model@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@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common.prevalidation@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@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@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,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.multisegment.model@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,org.apache.batik.constants*1.11.0.v20190515-0436@default:default,org.apache.batik.css*1.11.0.v20190515-0436@default:default,org.apache.batik.i18n*1.11.0.v20190515-0436@default:default,org.apache.batik.util*1.11.0.v20190515-0436@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.logging*1.2.0.v20180409-1502@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,org.apache.xmlgraphics@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.macosx@default:default,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.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.supplier@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.dialogs@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.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.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@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@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.event@default:default,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.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@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.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@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.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.control.multireference.tests@default:false,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.label.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common.di@default:default,org.eclipse.emf.ecp.view.model.common@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.model.test@default:false,org.eclipse.emf.ecp.view.table.model@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@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emfforms.common.prevalidation@default:default,org.eclipse.emfforms.common.validation@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@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.segments@default:default,org.eclipse.emfforms.core.services.structuralchange.default@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,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.multisegment.model@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
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 d6b70ba..9a8f2ab 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,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Multi Reference Control Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.control.multireference;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.control.multireference;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 53574dd..649633b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java
index 3861602..95a846d 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/src/org/eclipse/emf/ecp/view/internal/control/multireference/MultiReferenceRenderer_PTest.java
@@ -10,7 +10,7 @@
*
* Contributors:
* Lucas Koehler - initial API and implementation
- * Christian W. Damus - bug 527736
+ * Christian W. Damus - bugs 527736, 552385
******************************************************************************/
package org.eclipse.emf.ecp.view.internal.control.multireference;
@@ -56,6 +56,8 @@
import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.edit.spi.DeleteService;
+import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
import org.eclipse.emf.ecp.view.model.common.AbstractGridCell.Alignment;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.model.VControl;
@@ -177,6 +179,8 @@
when(viewContext.getDomainModel()).thenReturn(eObject);
when(viewContext.getViewModel()).thenReturn(vControl);
+ // Required for delete button enablement
+ when(viewContext.getService(DeleteService.class)).thenReturn(new EMFDeleteServiceImpl());
when(vControl.getDomainModelReference()).thenReturn(domainModelReference);
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 ddec532..0e97b57 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,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.provider;version="1.22.0",
- org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.core.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.provider;version="1.23.0",
+ org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.core.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.23.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
@@ -25,14 +25,14 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="1.0.0",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 882be6d..c5c181b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java
index 8a1444b..8bd9679 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/AbstractControlSWTRenderer_PTest.java
@@ -15,9 +15,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Collections;
@@ -31,7 +33,6 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
import org.eclipse.emf.ecp.test.common.DefaultRealm;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.model.LabelAlignment;
@@ -54,6 +55,8 @@
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.emfforms.spi.swt.core.ui.SWTValidationHelper;
+import org.eclipse.emfforms.spi.swt.core.ui.SWTValidationUiService;
import org.eclipse.emfforms.swt.common.test.AbstractControl_PTest.TestObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -232,8 +235,10 @@
assertEquals(SWT.RIGHT, Label.class.cast(render).getAlignment());
}
+ @SuppressWarnings("deprecation")
@Test
- public void testgetValidationBackgroundColor() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+ public void testgetValidationBackgroundColorLegacy()
+ throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
/* setup */
final SWTValidationHelper validationHelper = Mockito.mock(SWTValidationHelper.class);
@@ -275,8 +280,10 @@
}
+ @SuppressWarnings("deprecation")
@Test
- public void testgetValidationForeGroundColor() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+ public void testgetValidationForeGroundColorLegacy()
+ throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
/* setup */
final SWTValidationHelper validationHelper = Mockito.mock(SWTValidationHelper.class);
@@ -317,8 +324,9 @@
}
+ @SuppressWarnings("deprecation")
@Test
- public void testgetValidationIcon() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+ public void testgetValidationIconLegacy() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
/* setup */
final SWTValidationHelper validationHelper = Mockito.mock(SWTValidationHelper.class);
@@ -469,6 +477,98 @@
assertEquals(SWT.RIGHT, Label.class.cast(render).getAlignment());
}
+ /** Verify retrieving the validation icon for a VElement is forwarded to the {@link SWTValidationUiService}. */
+ @Test
+ public void getValidationIcon() {
+ final SWTValidationUiService validationUiService = mock(SWTValidationUiService.class);
+
+ renderer = new TestAbstractControlSWTRenderer(
+ vControl,
+ viewModelContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ viewTemplateProvider, validationUiService);
+ renderer.init();
+
+ final Image expected = new Image(Display.getCurrent(), 1, 1);
+ when(validationUiService.getValidationIcon(vControl, viewModelContext)).thenReturn(expected);
+
+ final Image result = renderer.getValidationIcon();
+ assertSame(expected, result);
+ }
+
+ /**
+ * Verify retrieving the validation foreground color for a VElement is forwarded to the
+ * {@link SWTValidationUiService}.
+ */
+ @Test
+ public void getValidationForegroundColor() {
+ final SWTValidationUiService validationUiService = mock(SWTValidationUiService.class);
+
+ renderer = new TestAbstractControlSWTRenderer(
+ vControl,
+ viewModelContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ viewTemplateProvider, validationUiService);
+ renderer.init();
+
+ final Color expected = new Color(Display.getCurrent(), 1, 2, 3);
+ when(validationUiService.getValidationForegroundColor(vControl, viewModelContext)).thenReturn(expected);
+
+ final Color result = renderer.getValidationForegroundColor();
+ assertSame(expected, result);
+ }
+
+ /**
+ * Verify retrieving the validation background color for a VElement is forwarded to the
+ * {@link SWTValidationUiService}.
+ */
+ @Test
+ public void getValidationBackgroundColor() {
+ final SWTValidationUiService validationUiService = mock(SWTValidationUiService.class);
+
+ renderer = new TestAbstractControlSWTRenderer(
+ vControl,
+ viewModelContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ viewTemplateProvider, validationUiService);
+ renderer.init();
+
+ final Color expected = new Color(Display.getCurrent(), 1, 2, 3);
+ when(validationUiService.getValidationBackgroundColor(vControl, viewModelContext)).thenReturn(expected);
+
+ final Color result = renderer.getValidationBackgroundColor();
+ assertSame(expected, result);
+ }
+
+ /**
+ * Test that the {@link SWTValidationUiService} implementation is retrieved from the view model context if it is not
+ * given in the constructor.
+ */
+ @Test
+ public void validationUiServiceRetrieval() {
+ final SWTValidationUiService customService = mock(SWTValidationUiService.class);
+ final Image expected = new Image(Display.getCurrent(), 1, 1);
+ when(customService.getValidationIcon(vControl, viewModelContext)).thenReturn(expected);
+ when(viewModelContext.getService(SWTValidationUiService.class)).thenReturn(customService);
+ renderer = new TestAbstractControlSWTRenderer(
+ vControl,
+ viewModelContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ viewTemplateProvider);
+ renderer.init();
+ final Image result = renderer.getValidationIcon();
+ assertSame(expected, result);
+
+ }
+
private class TestAbstractControlSWTRenderer extends AbstractControlSWTRenderer<VControl> {
TestAbstractControlSWTRenderer(
@@ -503,6 +603,22 @@
vtViewTemplateProvider, swtValidationHelper);
}
+ TestAbstractControlSWTRenderer(
+ VControl vElement,
+ ViewModelContext viewContext,
+ ReportService reportService,
+ EMFFormsDatabinding emfFormsDatabinding,
+ EMFFormsLabelProvider emfFormsLabelProvider,
+ VTViewTemplateProvider vtViewTemplateProvider, SWTValidationUiService validationUiService) {
+ super(
+ vElement,
+ viewContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ vtViewTemplateProvider, validationUiService);
+ }
+
@Override
public SWTGridDescription getGridDescription(SWTGridDescription gridDescription) {
final SWTGridDescription simpleGrid = GridDescriptionFactory.INSTANCE.createSimpleGrid(1, 1, this);
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 2dbb2af..d64c22d 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,41 +2,41 @@
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.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0"
Automatic-Module-Name: org.eclipse.emf.ecp.view.custom.ui.swt.test
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 9d4d674..433e445 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 c8fea8d..3a79bb3 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.22.0.qualifier"
+ version="1.23.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.22.0.qualifier">
+ license-feature-version="1.23.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 9260ce6..e11bea0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 4fe9fd7..ea9131b 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,21 +2,21 @@
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.22.0.qualifier
+Bundle-Version: 1.23.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.22.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model.edit
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 64678f9..e49119d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8fec995..116f8f7 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dynamic Containment Tree Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0";
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.23.0";
uses:="org.eclipse.emf.ecore,
org.eclipse.core.databinding,
org.eclipse.emf.ecp.view.context,
@@ -17,24 +17,24 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model.test
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 e73eebf..5402254 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 48ec826..39d3f82 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dynamic Containment Tree Model Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.22.0",
- org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.23.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.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.model
Service-Component: OSGI-INF/dynamicContainmentTreeDMRConverter.xml
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 f4f9961..24bcbeb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2671aa5..f4c94b4 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,20 +2,20 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.ui.swt
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.23.0,1.24.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 746a12c..3f7ad8b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 89cd45c..f281a11 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Dynamic Tree UI
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.dynamictree.ui
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 0fc3874..7ff958d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 815de22..1cc3088 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,32 +2,32 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._1160to1200;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._140to1170;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._160to1170;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._1160to1200;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._140to1170;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._160to1170;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.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.ecp.view.section.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.edapt.test
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 458b820..3a2ccf4 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 bb085f5..f607499 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.util.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.22.0",
- org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.23.0",
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.23.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 acde9e8..e32a31e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 5aa5bcc..36b1bf9 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,22 +2,22 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.group.ui.swt.test
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 82904ad..ec71bea 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1ef74f5..b583726 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,23 +2,23 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.horizontal.ui.swt.test
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 bc3472f..bf52373 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 645ed36..a62bdc2 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.indexdmr.model.test
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 d298a25..85e037c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 719e3b0..30f8d75 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.22.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.22.0",
- org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.23.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.keyattributedmr.model.test
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 00fb100..b412d90 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 78f86a0..ce3a430 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.mappingdmr.model.test
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 3401666..534a049 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
index dad8b69..70299c1 100644
--- a/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.migrator.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Template Tooling Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.migrator.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.23.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.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml b/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
index 5d8918f..fd85c8a 100644
--- a/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.migrator.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.migrator.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</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 2b581ce..3dd055a 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Common Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.23.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.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.common.test
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.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 cc49b57..6fb80af 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.22.0-SNAPSHOT</version>
+ <version>1.23.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 4b80ea9..ae7805c 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,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.edit.test
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 d1ae5e9..ae3a98e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 62496db..b27f404 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.22.0.qualifier">
+ version="1.23.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 f555d2d..30eca8c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
index 097dc6c..9bd694e 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Editor Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.22.0,1.23.0)"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.editor.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.refactoring;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.refactoring;version="1.23.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
index 92b0bf6..10497b0 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 d1584f6..71e2e34 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,8 +2,8 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.editor.testplugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 33e33bc..d9cff1c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 bb2e8fa..8401adb 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,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: Integrationtest
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.integrationtest
-Bundle-Version: 1.22.0.qualifier
-Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.annotation.model.edit;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.annotation.model.edit;bundle-version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.integrationtest
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 40ab313..f16f4b0 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
index d3bc0ac..0f4bda3 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Preview Common Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.common.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.23.0,1.24.0)"
Export-Package: org.eclipse.emf.ecp.view.model.preview.common.test;version="0.0.0"
Require-Bundle: org.eclipse.swt;bundle-version="[3.106.2,4.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
index 1f20526..363b132 100644
--- a/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.preview.common.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.preview.common.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
index 6645c9a..fc4d2f8 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Generator Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.generator.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.23.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.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
index 1b7792e..3ed2ed4 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.generator.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.generator.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
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 de25315..93f01ae 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,17 +2,17 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.provider.xmi.test
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 3bd0ed4..95d7445 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 84aa1f6..a6cb755 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Model Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.23.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)",
org.objenesis;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.model.test
-Import-Package: org.eclipse.emf.ecp.view.spi.group.model;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.spi.group.model;version="[1.23.0,1.24.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 14cc3eb..874f7b2 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.22.0-SNAPSHOT</version>
+ <version>1.23.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/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
index 8be14ca..2116e90 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,36 +2,36 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Rule Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.rule.ui.swt.test,org.eclipse.emf.ecp.view.unset.test",
- org.eclipse.emf.ecp.view.spi.rule;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.rule.ui.swt.test,org.eclipse.emf.ecp.view.unset.test",
+ org.eclipse.emf.ecp.view.spi.rule;version="1.23.0";x-internal:=true
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.test
-Import-Package: org.eclipse.emf.ecp.view.spi.validation;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.spi.validation;version="[1.23.0,1.24.0)"
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 46d5fa7..c4a038d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 69d27c0..389d8eb 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,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Rule Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.rule.ui.swt.test
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 31032dd..44f5e67 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
index 0aba3a0..c19eaf4 100644
--- a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for Section SWT Renderers
Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.section.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.section.swt;version="1.22.0"
+Fragment-Host: org.eclipse.emf.ecp.view.section.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.swt;version="1.23.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.0,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.section.ui.swt.test
diff --git a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
index b244bf9..849f395 100644
--- a/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.section.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.section.ui.swt.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 b8805df..45b151c 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,17 +2,17 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.stack.ui.swt.test
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 ed76dd1..772c33d 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 dfd9a25..f9d8382 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Model Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.22.0",
- org.eclipse.emf.ecp.view.table.model.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.23.0",
+ org.eclipse.emf.ecp.view.table.model.test;version="1.23.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 7c9f14c..c79a525 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
index f64b336..be35fb0 100644
--- a/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.test.common/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Utils for Table Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.test.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.test.common;version="1.22.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)"
+Export-Package: org.eclipse.emf.ecp.view.table.test.common;version="1.23.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.test.common
diff --git a/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml b/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
index f2eb327..76c9995 100644
--- a/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.test.common/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.test.common</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
index 84c4f6e..782e16e 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.nebula.grid;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.22.0",
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.23.0",
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.ui.nebula.grid.test.model.audit.util;version="1.23.0";x-internal:=true
Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
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.22.0,1.23.0)",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding.beans;bundle-version="1.3.0",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
org.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
index c833f39..f41cdef 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.nebula.grid.test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.table.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
index 8d58dcf..fe46568 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,56 +2,56 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the Table SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.22.0",
- org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.22.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
+Fragment-Host: org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.table.swt.cell;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.spi.table.swt.action;version="1.23.0",
+ org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.23.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.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.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.ui.swt.test
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 e10e083..4fa67cc 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
index 5702a7b..cb46131 100644
--- a/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.validation.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Validation Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.validation.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.table.validation.test;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.table.validation.test;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.table.validation.test
diff --git a/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
index 0a5557d..5166abb 100644
--- a/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.validation.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.validation.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
index 8984bce..366b537 100644
--- a/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.model.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Template Model Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.template.model.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.template.model.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.annotation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.bool.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.hierarchy.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.labelwidth.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.reference.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.unsettable.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.wrap.model.impl;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.model.test
-Import-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
index 00cc30b..8e60e52 100644
--- a/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.model.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.template.model.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 63d167a..aa59516 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Template Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.22.0",
- org.eclipse.emf.ecp.view.template.service;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.service.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.spi.view.template.service;version="1.23.0",
+ org.eclipse.emf.ecp.view.template.service;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.service.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.service.test
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 f1c28a9..eee46f7 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
index e97af2f..6630776 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.tooling.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.template.tooling.test
diff --git a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
index e6f2474..ad45794 100644
--- a/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.tooling.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.template.tooling.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<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 fbd594d..81d4a62 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 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)";visibility:=reexport
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common.swt
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
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 d5ff097..3f20113 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 553270c..d4d5336 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,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Test Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.23.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)"
-Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
- org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.reveal;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.22.0,1.23.0)",
- org.osgi.framework;version="[1.3.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.test.common
+Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
+ org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.reveal;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.23.0,1.24.0)",
+ org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
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 dc60daa..90af2f9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 0095ed6..5aad3a8 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,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the TreeMasterDetail Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.22.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.23.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.common.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.common.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
org.apache.log4j;bundle-version="[1.2.15,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)"
+Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
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 31433c9..c5bfe2e 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 4a118ba..17b73c0 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,17 +2,17 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.treemasterdetail.validation.test
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 b9bd467..82681ce 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 237e01d..d17df14 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,40 +2,40 @@
Bundle-ManifestVersion: 2
Bundle-Name: Editor SWTBot Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.ui.editor.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.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.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.23.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.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)",
org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.ui.editor.test
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 79a7c62..ef18779 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 ed682cd..c191e8f 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,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Unset Service Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.unset;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.unset;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.unset.test
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 8616302..6ffa9b8 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 34d81c1..922de75 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,19 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.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.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: car;version="1.22.0";x-internal:=true,
- car.impl;version="1.22.0";x-internal:=true,
- car.util;version="1.22.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean.test;version="1.22.0";x-internal:=true
+Export-Package: car;version="1.23.0";x-internal:=true,
+ car.impl;version="1.23.0";x-internal:=true,
+ car.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean.test;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.bean.test
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.23.0,2.0.0)"
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 3b2e1e8..6a3d6a7 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 90f9838..14ec5d9 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,31 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.22.0",
- org.eclipse.emf.ecp.view.validation.test.model;version="1.22.0",
- org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.22.0",
- org.eclipse.emf.ecp.view.validation.test.model.util;version="1.22.0"
+Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.23.0",
+ org.eclipse.emf.ecp.view.validation.test.model;version="1.23.0",
+ org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.23.0",
+ org.eclipse.emf.ecp.view.validation.test.model.util;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.prevalidation;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.prevalidation;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Automatic-Module-Name: org.eclipse.emf.ecp.view.validation.test
Bundle-ActivationPolicy: lazy
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 26eb6da..8c74d98 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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/ValidationProvider_PTest.java b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationProvider_PTest.java
index d1dc9e8..9233125 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationProvider_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/src/org/eclipse/emf/ecp/view/validation/test/ValidationProvider_PTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,9 +10,12 @@
*
* Contributors:
* Eugen Neufeld - initial API and implementation
+ * Christian W. Damus - bug 552715
******************************************************************************/
package org.eclipse.emf.ecp.view.validation.test;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -252,4 +255,74 @@
validationService.validate(Collections.singleton(EObject.class.cast(computer)));
assertEquals(Diagnostic.OK, control.getDiagnostic().getHighestSeverity());
}
+
+ /**
+ * @see <a href="http://eclip.se/552715">bug 552715</a>
+ */
+ @Test
+ public void testValidationProviderInitializedWithContext() {
+ final ViewModelContext[] capturedContext = { null };
+
+ validationService.addValidationProvider(new ValidationProvider() {
+
+ @Override
+ public List<Diagnostic> validate(EObject eObject) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void setContext(ViewModelContext context) {
+ capturedContext[0] = context;
+ }
+ });
+
+ assertThat("No view-model context captured", capturedContext[0], notNullValue());
+ }
+
+ /**
+ * @see <a href="http://eclip.se/552715">bug 552715</a>
+ */
+ @Test
+ public void testValidationProviderDisposedWithContext() {
+ final ViewModelContext[] capturedContext = { null };
+
+ final ValidationProvider provider = new ValidationProvider() {
+
+ @Override
+ public List<Diagnostic> validate(EObject eObject) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void unsetContext(ViewModelContext context) {
+ capturedContext[0] = context;
+ }
+ };
+ validationService.addValidationProvider(provider);
+ validationService.removeValidationProvider(provider);
+
+ assertThat("No view-model context captured", capturedContext[0], notNullValue());
+ }
+
+ /**
+ * @see <a href="http://eclip.se/552715">bug 552715</a>
+ */
+ @Test
+ public void testValidationProviderInvokedWithContext() {
+ final ViewModelContext[] capturedContext = { null };
+
+ final ValidationProvider provider = new ValidationProvider.ContextSensitive() {
+
+ @Override
+ public Iterable<? extends Diagnostic> validate(ViewModelContext context, EObject object) {
+ capturedContext[0] = context;
+ return Collections.emptyList();
+ }
+ };
+
+ validationService.addValidationProvider(provider);
+
+ assertThat("No view-model context captured", capturedContext[0], notNullValue());
+ }
+
}
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 214c7d9..1501c3a 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2018 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,17 +10,24 @@
*
* Contributors:
* Stefan Dirix - initial API and implementation
- * Christian W. Damus - bug 533522
+ * Christian W. Damus - bugs 533522, 552127
******************************************************************************/
package org.eclipse.emf.ecp.view.validation.test;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecore.EObject;
@@ -35,6 +42,7 @@
import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
import org.eclipse.emf.ecp.view.spi.validation.ValidationProvider;
import org.eclipse.emf.ecp.view.spi.validation.ValidationService;
+import org.eclipse.emf.ecp.view.spi.validation.ViewValidationListener;
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.TableContentWithInnerChild;
@@ -389,4 +397,82 @@
/* assert no NPE */
}
+ @Test
+ public void testValidate_Iterable() {
+ final AtomicReference<Collection<EObject>> validated = new AtomicReference<>();
+
+ // CHECKSTYLE.OFF: AnonInnerLength - it's a test
+ final ValidationService validationService = new ValidationService() {
+
+ @Override
+ public void validate(Collection<EObject> eObjects) {
+ validated.set(eObjects);
+ }
+
+ @Override
+ public void instantiate(ViewModelContext context) {
+ // Not interesting
+ }
+
+ @Override
+ public int getPriority() {
+ // Not interesting
+ return 0;
+ }
+
+ @Override
+ public void dispose() {
+ // Not interesting
+ }
+
+ @Override
+ public void childViewModelContextAdded(ViewModelContext childContext) {
+ // Not interesting
+ }
+
+ @Override
+ public void removeValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
+ // Not interesting
+ }
+
+ @Override
+ public void removeValidationProvider(ValidationProvider validationProvider) {
+ // Not interesting
+ }
+
+ @Override
+ public void registerValidationListener(ViewValidationListener listener) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public void deregisterValidationListener(ViewValidationListener listener) {
+ // Not interesting
+ }
+
+ @Override
+ public void addValidationProvider(ValidationProvider validationProvider, boolean revalidate) {
+ // Not interesting
+ }
+
+ @Override
+ public void addValidationProvider(ValidationProvider validationProvider) {
+ // Not interesting
+ }
+ };
+ // CHECKSTYLE.ON: AnonInnerLength
+
+ final List<EObject> eObjects = Arrays.asList(
+ mock(EObject.class, "a"),
+ mock(EObject.class, "b"),
+ mock(EObject.class, "c"));
+
+ final Iterable<EObject> iterable = eObjects::iterator;
+ validationService.validate(iterable);
+
+ assertThat("No collection passed to validation service", validated.get(), notNullValue());
+ assertThat("Collection has wrong size", validated.get().size(), is(eObjects.size()));
+ assertThat("Collection has wrong elements", new ArrayList<>(validated.get()), equalTo(eObjects));
+ }
+
}
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 cbf9f7d..00b91db 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,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the VerticalSWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.vertical.ui.swt.test
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 541cb8b..060aa9c 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 051b2ba..67a9ca7 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewProxy Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.22.0",
- org.eclipse.emf.ecp.view.viewproxy.tests;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.23.0",
+ org.eclipse.emf.ecp.view.viewproxy.tests;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.view.viewproxy.tests
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 956024b..e7cd707 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
index 503e926..32f00bc 100644
--- a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui.rap.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.ui.rap.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.ui.rap.test;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.23.0,1.24.0)",
org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.ecp.workspace.ui.rap.test
Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.core;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.23.0,1.24.0)",
org.osgi.framework;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
index 6a1bd78..b8bd99e 100644
--- a/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.workspace.ui.rap.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.workspace.ui.rap.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 78047f8..00f4720 100644
--- a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Locale Tests
Bundle-SymbolicName: org.eclipse.emfforms.common.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.common.sort;version="1.22.0",
- org.eclipse.emfforms.common.tests;version="1.22.0",
- org.eclipse.emfforms.spi.common.locale;version="1.22.0",
- org.eclipse.emfforms.spi.common.validation;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.common.sort;version="1.23.0",
+ org.eclipse.emfforms.common.tests;version="1.23.0",
+ org.eclipse.emfforms.spi.common.locale;version="1.23.0",
+ org.eclipse.emfforms.spi.common.validation;version="1.23.0"
Require-Bundle: org.hamcrest.library;bundle-version="[1.3.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
org.junit;bundle-version="[4.12.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.common.tests
diff --git a/tests/org.eclipse.emfforms.common.tests/pom.xml b/tests/org.eclipse.emfforms.common.tests/pom.xml
index 565e7aa..35a5250 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
index 7b02454..4820e29 100644
--- a/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.validation.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Common Validation Tests
Bundle-SymbolicName: org.eclipse.emfforms.common.validation.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.common.validation.tests;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.common.internal.validation;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.common.validation.tests;version="1.23.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.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
diff --git a/tests/org.eclipse.emfforms.common.validation.tests/pom.xml b/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
index 42d8b62..541dd86 100644
--- a/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.common.validation.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.common.validation.tests</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
index 0c6fdbc..1a6dd9c 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Bazaar Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.bazaar.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.bazaar.internal;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.bazaar.internal;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)"
@@ -12,5 +12,5 @@
Automatic-Module-Name: org.eclipse.emfforms.core.bazaar.tests
Import-Package: org.eclipse.core.runtime;version="[3.5.0,4.0.0)",
org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml b/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
index b94b4ba..5715219 100644
--- a/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.bazaar.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.bazaar.tests</artifactId>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch
index 3cc1a39..a1d816c 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/All Integration Tests for core.services.databinding.featurepath.launch
@@ -1,43 +1,44 @@
-<?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.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/core/services/databinding/featurepath/tests/AllIntegrationTests.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.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emfforms.core.services.databinding.featurepath.tests.AllIntegrationTests"/>
-<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.emfforms.core.services.databinding.featurepath.tests"/>
-<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.xml@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.emf.common@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore@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.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-all@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.view.model@default:default,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.testmodel@default:default,org.eclipse.emfforms.core.services.databinding@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.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/core/services/databinding/featurepath/tests/AllIntegrationTests.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"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<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.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emfforms.core.services.databinding.featurepath.tests.AllIntegrationTests"/>
+<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.emfforms.core.services.databinding.featurepath.tests"/>
+<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.inject@default:default,org.apache.felix.scr@1:true,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.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@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.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@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.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.bazaar@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.testmodel@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization@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.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 7d51c14..3475fa1 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: Databinding Services Featurepath Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.23.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.objenesis;bundle-version="[1.0.0,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.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.featurepath.tests
Bundle-ActivationPolicy: lazy
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 ca46ade..6813efd 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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.databinding.featurepath.tests</artifactId>
@@ -42,6 +42,6 @@
</plugins>
</build>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java
index c824223..68c1fe4 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/src/org/eclipse/emfforms/internal/core/services/databinding/featurepath/FeaturePathDomainModelReferenceConverter_Test.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2018 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2019 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 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Lucas Koehler - initial API and implementation
+ * Christian W. Damus - bug 553224
******************************************************************************/
package org.eclipse.emfforms.internal.core.services.databinding.featurepath;
@@ -18,6 +19,7 @@
import static org.mockito.Mockito.mock;
import java.util.LinkedList;
+import java.util.regex.Pattern;
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
@@ -27,6 +29,7 @@
import org.eclipse.emf.databinding.IEMFValueProperty;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
@@ -35,8 +38,13 @@
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.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+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.VFeaturePathDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.model.VView;
import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
@@ -50,9 +58,13 @@
import org.eclipse.emfforms.core.services.databinding.testmodel.test.model.TestPackage;
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
import org.eclipse.emfforms.spi.core.services.databinding.DomainModelReferenceConverter;
+import org.hamcrest.CustomTypeSafeMatcher;
+import org.hamcrest.Matcher;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
/**
* JUnit test for {@link FeaturePathDomainModelReferenceConverter}.
@@ -65,6 +77,9 @@
private FeaturePathDomainModelReferenceConverter converter;
private static EObject validEObject;
+ @Rule
+ public final ExpectedException thrown = ExpectedException.none();
+
@BeforeClass
public static void setupClass() {
validEObject = createValidEObject();
@@ -81,11 +96,12 @@
private static Resource createVirtualResource() {
final ResourceSet rs = new ResourceSetImpl();
+ rs.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); //$NON-NLS-1$
final AdapterFactoryEditingDomain domain = new AdapterFactoryEditingDomain(
new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE),
new BasicCommandStack(), rs);
rs.eAdapters().add(new AdapterFactoryEditingDomain.EditingDomainProvider(domain));
- final Resource resource = rs.createResource(URI.createURI("VIRTAUAL_URI")); //$NON-NLS-1$
+ final Resource resource = rs.createResource(URI.createURI("VIRTUAL_URI.xmi")); //$NON-NLS-1$
return resource;
}
@@ -102,6 +118,28 @@
return AdapterFactoryEditingDomain.getEditingDomainFor(object);
}
+ private static VFeaturePathDomainModelReference createValidDMR() {
+ final Resource resource = createVirtualResource();
+ final VView view = VViewFactory.eINSTANCE.createView();
+ final VControl control = VViewFactory.eINSTANCE.createControl();
+ view.getChildren().add(control);
+ resource.getContents().add(view);
+ final VFeaturePathDomainModelReference result = VViewFactory.eINSTANCE.createFeaturePathDomainModelReference();
+ control.setDomainModelReference(result);
+ ((XMLResource) resource).setID(result, "theDMR"); //$NON-NLS-1$
+ return result;
+ }
+
+ static Matcher<String> find(String regex) {
+ return new CustomTypeSafeMatcher<String>("matches '" + regex + "'") { //$NON-NLS-1$//$NON-NLS-2$
+ @Override
+ protected boolean matchesSafely(String item) {
+ final java.util.regex.Matcher m = Pattern.compile(regex).matcher(item);
+ return m.find();
+ }
+ };
+ }
+
/**
* Set up that is executed before every test.
*/
@@ -133,8 +171,11 @@
* {@link org.eclipse.emfforms.core.services.databinding.featurepath.FeaturePathDomainModelReferenceConverter#isApplicable(org.eclipse.emf.ecp.view.spi.model.VDomainModelReference)}
* .
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testIsApplicableNull() {
+ thrown.expect(IllegalArgumentException.class);
+ thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
converter.isApplicable(null);
}
@@ -212,8 +253,12 @@
*
* @throws DatabindingFailedException if the databinding failed
*/
- @Test(expected = DatabindingFailedException.class)
+ @Test
public void testConvertToValuePropertyNoFeature() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("field domainModelEFeature"); //$NON-NLS-1$
+ thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
.createFeaturePathDomainModelReference();
converter.convertToValueProperty(pathReference, validEObject);
@@ -226,8 +271,11 @@
*
* @throws DatabindingFailedException if the databinding failed
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testConvertToValuePropertyNull() throws DatabindingFailedException {
+ thrown.expect(IllegalArgumentException.class);
+ thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
converter.convertToValueProperty(null, validEObject);
}
@@ -238,9 +286,55 @@
*
* @throws DatabindingFailedException if the databinding failed
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testConvertToValuePropertyWrongReferenceType() throws DatabindingFailedException {
- converter.convertToValueProperty(mock(VDomainModelReference.class), validEObject);
+ final VDomainModelReference dmr = mock(VDomainModelReference.class);
+
+ thrown.expect(IllegalArgumentException.class);
+ thrown.expectMessage("DomainModelReference " + dmr.toString()); //$NON-NLS-1$
+ thrown.expectMessage("is not an instance of VFeaturePathDomainModelReference"); //$NON-NLS-1$
+
+ converter.convertToValueProperty(dmr, validEObject);
+ }
+
+ @Test
+ public void testConvertToValuePropertyListReferenceFirstInPath() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("not a single reference: A.bList (test)"); //$NON-NLS-1$
+ thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+
+ final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+ .createFeaturePathDomainModelReference();
+ // create reference path to the attribute
+ final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+ referencePath.add(TestPackage.Literals.A__BLIST);
+ referencePath.add(TestPackage.Literals.B__C);
+ referencePath.add(TestPackage.Literals.C__D);
+
+ pathReference.getDomainModelEReferencePath().addAll(referencePath);
+ pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+ converter.convertToValueProperty(pathReference, validEObject);
+ }
+
+ @Test
+ public void testConvertToValuePropertyListReferenceInPath() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("not a single reference: B.cList (test)"); //$NON-NLS-1$
+ thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+
+ final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+ .createFeaturePathDomainModelReference();
+ // create reference path to the attribute
+ final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+ referencePath.add(TestPackage.Literals.A__B);
+ referencePath.add(TestPackage.Literals.B__CLIST);
+ referencePath.add(TestPackage.Literals.C__D);
+
+ pathReference.getDomainModelEReferencePath().addAll(referencePath);
+ pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+ converter.convertToValueProperty(pathReference, validEObject);
}
@Test
@@ -344,8 +438,12 @@
*
* @throws DatabindingFailedException if the databinding failed
*/
- @Test(expected = DatabindingFailedException.class)
+ @Test
public void testConvertToListPropertyNoFeature() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("field domainModelEFeature"); //$NON-NLS-1$
+ thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
.createFeaturePathDomainModelReference();
converter.convertToListProperty(pathReference, validEObject);
@@ -388,8 +486,11 @@
*
* @throws DatabindingFailedException if the databinding failed
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testConvertToListPropertyNull() throws DatabindingFailedException {
+ thrown.expect(IllegalArgumentException.class);
+ thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
converter.convertToListProperty(null, validEObject);
}
@@ -400,8 +501,11 @@
*
* @throws DatabindingFailedException if the databinding failed
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testConvertToListPropertyWrongReferenceType() throws DatabindingFailedException {
+ thrown.expect(IllegalArgumentException.class);
+ thrown.expectMessage("not an instance of VFeaturePathDomainModelReference"); //$NON-NLS-1$
+
converter.convertToListProperty(mock(VDomainModelReference.class), validEObject);
}
@@ -456,30 +560,203 @@
assertEquals(expected, setting.get(true));
}
- @Test(expected = DatabindingFailedException.class)
+ @Test
public void testGetSettingNoFeature() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("field domainModelEFeature"); //$NON-NLS-1$
+ thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
.createFeaturePathDomainModelReference();
converter.getSetting(pathReference, validEObject);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetSettingNull() throws DatabindingFailedException {
+ thrown.expect(IllegalArgumentException.class);
+ thrown.expectMessage("must not be null"); //$NON-NLS-1$
+
converter.getSetting(null, validEObject);
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testGetSettingWrongReferenceType() throws DatabindingFailedException {
+ thrown.expect(IllegalArgumentException.class);
+ thrown.expectMessage("not an instance of VFeaturePathDomainModelReference"); //$NON-NLS-1$
+
converter.getSetting(mock(VDomainModelReference.class), validEObject);
}
- @Test(expected = DatabindingFailedException.class)
+ @Test
public void testGetSettingInvalidFeatureInPath() throws DatabindingFailedException {
- final VFeaturePathDomainModelReference reference = VViewFactory.eINSTANCE
- .createFeaturePathDomainModelReference();
- reference.getDomainModelEReferencePath().add(TestPackage.eINSTANCE.getDExtended_A());
- reference.setDomainModelEFeature(TestPackage.eINSTANCE.getA_B());
- final D d = TestFactory.eINSTANCE.createD();
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("EClass D (test) has no such feature DExtended.a (test)"); //$NON-NLS-1$
+ thrown.expectMessage(find(
+ "The DMR is VFeaturePathDomainModelReferenceImpl@\\p{XDigit}+ \\(changeListener: null\\)<VIRTUAL_URI\\.xmi#theDMR>")); //$NON-NLS-1$
+ thrown.expectMessage(
+ find("resolved EObject is DImpl@\\p{XDigit}+ \\(x: null, yList: null\\)<VIRTUAL_URI\\.xmi#/>")); //$NON-NLS-1$
+
+ final D d = (D) createValidEObject(TestPackage.Literals.D);
+ final VFeaturePathDomainModelReference reference = createValidDMR();
+ reference.getDomainModelEReferencePath().add(TestPackage.Literals.DEXTENDED__A);
+ reference.setDomainModelEFeature(TestPackage.Literals.A__B);
converter.getSetting(reference, d);
}
+
+ @Test
+ public void testGetSettingUnresolvedFeature() throws DatabindingFailedException {
+ final EPackage pkg = EcoreFactory.eINSTANCE.createEPackage();
+ pkg.setName("gone"); //$NON-NLS-1$
+ pkg.setNsPrefix("gone"); //$NON-NLS-1$
+ pkg.setNsURI("http://www.eclipse.org/ecp/test/gone"); //$NON-NLS-1$
+ final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+ eClass.setName("Gone"); //$NON-NLS-1$
+ final EReference ref = EcoreFactory.eINSTANCE.createEReference();
+ ref.setName("ref"); //$NON-NLS-1$
+ ref.setEType(eClass);
+ eClass.getEStructuralFeatures().add(ref);
+ pkg.getEClassifiers().add(eClass);
+ final Resource resource = new EcoreResourceFactoryImpl().createResource(URI.createURI(pkg.getNsURI()));
+ resource.getContents().add(pkg);
+
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("domainModelEFeature Gone.ref (http://www.eclipse.org/ecp/test/gone)"); //$NON-NLS-1$
+ thrown.expectMessage(find(
+ "DMR VFeaturePathDomainModelReferenceImpl@\\p{XDigit}+ \\(changeListener: null\\)<VIRTUAL_URI\\.xmi#theDMR>")); //$NON-NLS-1$
+ thrown.expectMessage("is a proxy"); //$NON-NLS-1$
+
+ final D d = (D) createValidEObject(TestPackage.Literals.D);
+ final VFeaturePathDomainModelReference reference = createValidDMR();
+ reference.getDomainModelEReferencePath().add(TestPackage.Literals.DEXTENDED__A);
+ reference.setDomainModelEFeature(ref);
+
+ // Unload the package to proxify everything
+ resource.unload();
+
+ converter.getSetting(reference, d);
+ }
+
+ @Test
+ public void testGetSettingUnresolvedReferenceInPath() throws DatabindingFailedException {
+ final EPackage pkg = EcoreFactory.eINSTANCE.createEPackage();
+ pkg.setName("gone"); //$NON-NLS-1$
+ pkg.setNsPrefix("gone"); //$NON-NLS-1$
+ pkg.setNsURI("http://www.eclipse.org/ecp/test/gone"); //$NON-NLS-1$
+ final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+ eClass.setName("Gone"); //$NON-NLS-1$
+ final EReference ref = EcoreFactory.eINSTANCE.createEReference();
+ ref.setName("ref"); //$NON-NLS-1$
+ ref.setEType(eClass);
+ eClass.getEStructuralFeatures().add(ref);
+ pkg.getEClassifiers().add(eClass);
+ final Resource resource = new EcoreResourceFactoryImpl().createResource(URI.createURI(pkg.getNsURI()));
+ resource.getContents().add(pkg);
+
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("path reference Gone.ref (http://www.eclipse.org/ecp/test/gone)"); //$NON-NLS-1$
+ thrown.expectMessage(find(
+ "DMR VFeaturePathDomainModelReferenceImpl@\\p{XDigit}+ \\(changeListener: null\\)<VIRTUAL_URI\\.xmi#theDMR>")); //$NON-NLS-1$
+ thrown.expectMessage("is a proxy"); //$NON-NLS-1$
+
+ final D d = (D) createValidEObject(TestPackage.Literals.D);
+ final VFeaturePathDomainModelReference reference = createValidDMR();
+ reference.getDomainModelEReferencePath().add(ref);
+ reference.setDomainModelEFeature(TestPackage.Literals.A__B);
+
+ // Unload the package to proxify everything
+ resource.unload();
+
+ converter.getSetting(reference, d);
+ }
+
+ @Test
+ public void testGetSettingListReferenceInPath() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("not a single reference: B.cList (test)"); //$NON-NLS-1$
+ thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+ thrown.expectMessage(
+ find("resolved EObject is BImpl@\\p{XDigit}+<VIRTUAL_URI\\.xmi#//@b>")); //$NON-NLS-1$
+
+ final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+ .createFeaturePathDomainModelReference();
+ // create reference path to the attribute
+ final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+ referencePath.add(TestPackage.Literals.A__B);
+ referencePath.add(TestPackage.Literals.B__CLIST);
+ referencePath.add(TestPackage.Literals.C__D);
+
+ pathReference.getDomainModelEReferencePath().addAll(referencePath);
+ pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+ final A a = (A) createValidEObject(TestPackage.Literals.A);
+ final B b = TestFactory.eINSTANCE.createB();
+ a.setB(b);
+ converter.getSetting(pathReference, a);
+ }
+
+ @Test
+ public void testGetSettingMissingObjectInPath() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("DMR is VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+ thrown.expectMessage(
+ find("resolved EObject is BImpl@\\p{XDigit}+<VIRTUAL_URI\\.xmi#//@b>")); //$NON-NLS-1$
+ thrown.expectMessage("Reference being resolved is B.c (test)"); //$NON-NLS-1$
+
+ final VFeaturePathDomainModelReference pathReference = VViewFactory.eINSTANCE
+ .createFeaturePathDomainModelReference();
+ // create reference path to the attribute
+ final LinkedList<EReference> referencePath = new LinkedList<EReference>();
+ referencePath.add(TestPackage.Literals.A__B);
+ referencePath.add(TestPackage.Literals.B__C);
+ referencePath.add(TestPackage.Literals.C__D);
+
+ pathReference.getDomainModelEReferencePath().addAll(referencePath);
+ pathReference.setDomainModelEFeature(TestPackage.Literals.D__X);
+
+ final A a = (A) createValidEObject(TestPackage.Literals.A);
+ final B b = TestFactory.eINSTANCE.createB();
+ a.setB(b);
+ converter.getSetting(pathReference, a);
+ }
+
+ @Test
+ public void testGetSettingFeatureHasNoType() throws DatabindingFailedException {
+ final EPackage pkg = EcoreFactory.eINSTANCE.createEPackage();
+ pkg.setName("untyped"); //$NON-NLS-1$
+ pkg.setNsPrefix("ut"); //$NON-NLS-1$
+ pkg.setNsURI("http://www.eclipse.org/ecp/test/untyped"); //$NON-NLS-1$
+ final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+ eClass.setName("Untyped"); //$NON-NLS-1$
+ final EReference ref = EcoreFactory.eINSTANCE.createEReference();
+ ref.setName("untyped"); //$NON-NLS-1$
+ // Don't set a type (that's the point)
+ eClass.getEStructuralFeatures().add(ref);
+ pkg.getEClassifiers().add(eClass);
+ final Resource resource = new EcoreResourceFactoryImpl().createResource(URI.createURI(pkg.getNsURI()));
+ resource.getContents().add(pkg);
+
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage("in DMR VFeaturePathDomainModelReferenceImpl@"); //$NON-NLS-1$
+ thrown.expectMessage("eType of the feature Untyped.untyped (http://www.eclipse.org/ecp/test/untyped) is null"); //$NON-NLS-1$
+
+ final VFeaturePathDomainModelReference dmr = createValidDMR();
+ dmr.setDomainModelEFeature(ref);
+
+ final EObject untyped = createValidEObject(eClass);
+ converter.getSetting(dmr, untyped);
+ }
+
+ @Test
+ public void testGetSettingObjectDoesNotHaveFeature() throws DatabindingFailedException {
+ thrown.expect(DatabindingFailedException.class);
+ thrown.expectMessage(find("resolved EObject BImpl@\\p{XDigit}+<VIRTUAL_URI.xmi#/>")); //$NON-NLS-1$
+ thrown.expectMessage("doesn't have the feature C.d (test)"); //$NON-NLS-1$
+
+ final VFeaturePathDomainModelReference dmr = createValidDMR();
+ dmr.setDomainModelEFeature(TestPackage.Literals.C__D);
+
+ final EObject b = createValidEObject(TestPackage.Literals.B);
+ converter.getSetting(dmr, b);
+ }
+
}
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 8784ae3..1160885 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Converter Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.index;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.index;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.index.tests
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 2d3cb92..07fe1c9 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 8512a97..3846ee6 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Databinding Services Integration Test
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.integrationtest
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.integrationtest
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 9e1d85a..dc4b66f 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6522ace..a88e5b5 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute DMR Converter Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
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 73e98b1..6c5ff69 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 3ceb70a..9f83ea4 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Converter Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.databinding.mapping.tests
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 4b77e79..4f6debd 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 fedab3b..bc30099 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.testmodel;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.22.0",
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.23.0",
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.23.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.8
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 ef77f3b..01cdc91 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
index f81881b..78896c9 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms DataTemplate Service Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.datatemplate.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.datatemplate;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emfforms.core.services.datatemplate;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.datatemplate.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit.impl;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.core.services.datatemplate.test.model.audit.util;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.datatemplate;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.datatemplate.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit.impl;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.datatemplate.test.model.audit.util;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.datatemplate;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
@@ -19,7 +19,7 @@
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
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.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
index 7b35de5..11c66c2 100644
--- a/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.datatemplate.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.datatemplate.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
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 4ea4ef9..50ad4c5 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default Domain Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.default.tests
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 dc49ca3..b7df789 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 2e0c05a..f0de1fc 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.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.8
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 7921f3a..264c5fa 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 1a4b75e..94c838e 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute DMR Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
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 6b35244..27cc67b 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 437266a..72fe370 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
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 89518a7..6974198 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 6a6769e..2b4d217 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Service EMF Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.23.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
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 0cf2b85..4c7a13a 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 7b4da9d..8dcf67e 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services Legacy Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy.tests;singleton:=true
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.legacy;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.legacy;version="1.23.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.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.legacy.tests
-Import-Package: org.eclipse.emfforms.common;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.23.0,1.24.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 ff878e3..7886c41 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
index 9707c60..521ff56 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Mapping Provider Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.panel.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider.table.panel;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
index 9e33d57..0f1c1d8 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.panel.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.mappingprovider.table.panel.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
index 771749e..549b935 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Mapping Provider Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.mappingprovider.table.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
index f8b3dd5..d449ff2 100644
--- a/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.mappingprovider.table.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.mappingprovider.table.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
index 485292c..75fee09 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Core Services for Featurepath Segments Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.featurepath.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.featurepath.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.featurepath.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.featurepath;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
index fe3fc7b..33c484b 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.featurepath.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.segments.featurepath.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<build>
<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
index 7ffade9..04dfd2d 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Core Services for Index Segments Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.index.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.index.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.index;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.index;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.index.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.index;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
index 55477b4..04d1e94 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.index.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.segments.index.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<build>
<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
index 74a4c84..f00cf51 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Mapping Segment Services Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.mapping.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.mapping.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments.mapping;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.mapping.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.mapping;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.mapping.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
index 902c8fb..1327a86 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.mapping.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.segments.mapping.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<build>
<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
index b306683..1757212 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Multi Segment Services Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.multi.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.multi.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments.multi;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.segments.multi;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.multi.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments.multi;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.multi.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
index 42661fd..577149b 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.multi.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.segments.multi.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<build>
<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
index 03d4273..352ba50 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Services for DMR Segments Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.segments.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.segments;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.segments.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.segments;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.segments;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.segments.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.segments;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.segments.test
diff --git a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
index abeb834..62085e9 100644
--- a/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.segments.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.segments.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 ac179fc..b13c645 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,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Key Attribute Structural Change Tester Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.common;bundle-version="[2.11.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
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 223ea61..cc8e311 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
index 016cf5a..fc8d648 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange;version="1.23.0";x-internal:=true
Require-Bundle: org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.structuralchange.test
Import-Package: org.osgi.framework;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
index baccbf7..3cb344b 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 6509a71..b730109 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,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.core.services.view;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.reveal;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.tests;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.core.services.view;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.reveal;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.tests;version="1.23.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.objenesis;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.core.services.tests
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)",
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.3.0,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 499f1d7..073f9bb 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.classpath b/tests/org.eclipse.emfforms.datatemplate.model.tests/.classpath
new file mode 100644
index 0000000..3e5654f
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.classpath
@@ -0,0 +1,11 @@
+<?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.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.project b/tests/org.eclipse.emfforms.datatemplate.model.tests/.project
new file mode 100644
index 0000000..1fb72b6
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.datatemplate.model.tests</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>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.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/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..557976e
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.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.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.8
+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/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.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/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..6ed4937
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.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">/**\n * @return the ${bare_field_name}\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">/**\n * @param ${param} the ${bare_field_name} to set\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">/**\n * ${tags}\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">/*******************************************************************************\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License 2.0\n * which accompanies this distribution, and is available at\n * https\://www.eclipse.org/legal/epl-2.0/\n *\n * SPDX-License-Identifier\: EPL-2.0\n * \n * Contributors\:\n * ${user} - initial API and implementation\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">/**\n * @author ${user}\n *\n * ${tags}\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">/**\n * ${tags}\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">/**\n * {@inheritDoc}\n * ${see_to_overridden}\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">/**\n * ${tags}\n * ${see_to_target}\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}\n${package_declaration}\n\n${typecomment}\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">\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">\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">\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">\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\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\n\t\t\t// Log AND handle Exceptions if possible \n //\n // You can just uncomment one of the lines below to log an exception\:\n\t\t\t// logException will show the logged excpetion to the user\n\t\t\t// ModelUtil.logException(${exception_var});\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\n\t\t\t// logWarning will only add the message to the error log\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\n\t\t\t//\t\t\t\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\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}\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/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.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/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..cfb400b
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,104 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error
+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_FIELD=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_DEFAULT_METHOD=Ignore
+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=Warning
+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
+changed_execution_env=Error
+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
+incompatible_api_component_version_report_major_without_breaking_change=Ignore
+incompatible_api_component_version_report_minor_without_api_change=Ignore
+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/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.emfforms.datatemplate.model.tests/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/.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/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..611427e
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMFForms DataTemplate Model Tests
+Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.model.tests
+Bundle-Version: 1.23.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: Eclipse Modeling Project
+Fragment-Host: org.eclipse.emfforms.datatemplate.model;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.datatemplate.tests;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
+ org.junit;bundle-version="[4.11.0,5.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.emfforms.datatemplate.model.tests
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/build.properties b/tests/org.eclipse.emfforms.datatemplate.model.tests/build.properties
new file mode 100644
index 0000000..366941c
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/build.properties
@@ -0,0 +1,17 @@
+# Copyright (c) 2011-2019 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 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# EclipseSource Muenchen GmbH - initial API and implementation
+
+bin.includes = .,\
+ META-INF/
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml b/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml
new file mode 100644
index 0000000..8bdef29
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/pom.xml
@@ -0,0 +1,55 @@
+<?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-tests-parent</artifactId>
+ <version>1.23.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
+ </parent>
+
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>org.eclipse.emfforms.datatemplate.model.tests</artifactId>
+ <version>1.23.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${mav-surefire-version}</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <configuration>
+ <skipTests>false</skipTests>
+ <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+ <includes>
+ <include>**/DataTemplateAllTests.java</include>
+ </includes>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ <!-- We don't have tests that require Eclipse run-time -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateAllTests.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateAllTests.java
new file mode 100644
index 0000000..daad896
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateAllTests.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * <!-- begin-user-doc -->
+ * A test suite for the '<em><b>DataTemplate</b></em>' model.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DataTemplateAllTests extends TestSuite {
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static Test suiteGen() {
+ final TestSuite suite = new DataTemplateAllTests("DataTemplate Tests"); //$NON-NLS-1$
+ return suite;
+ }
+
+ /**
+ * @generated NOT
+ */
+ public static Test suite() {
+ final TestSuite suite = (TestSuite) suiteGen();
+ suite.addTest(DataTemplateTests.suite());
+ return suite;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public DataTemplateAllTests(String name) {
+ super(name);
+ }
+
+} // DataTemplateAllTests
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateTests.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateTests.java
new file mode 100644
index 0000000..a1bca6a
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/DataTemplateTests.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * <!-- begin-user-doc -->
+ * A test suite for the '<em><b>datatemplate</b></em>' package.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DataTemplateTests extends TestSuite {
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static Test suiteGen() {
+ final TestSuite suite = new DataTemplateTests("datatemplate Tests"); //$NON-NLS-1$
+ return suite;
+ }
+
+ /**
+ * @generated NOT
+ */
+ public static Test suite() {
+ final TestSuite suite = (TestSuite) suiteGen();
+ suite.addTestSuite(TemplateTest.class);
+ return suite;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public DataTemplateTests(String name) {
+ super(name);
+ }
+
+} // DataTemplateTests
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateCollectionTest.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateCollectionTest.java
new file mode 100644
index 0000000..ee9ac53
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateCollectionTest.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import junit.framework.TestCase;
+
+import junit.textui.TestRunner;
+
+import org.eclipse.emfforms.datatemplate.DataTemplateFactory;
+import org.eclipse.emfforms.datatemplate.TemplateCollection;
+
+/**
+ * <!-- begin-user-doc -->
+ * A test case for the model object '<em><b>Template Collection</b></em>'.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class TemplateCollectionTest extends TestCase {
+
+ /**
+ * The fixture for this Template Collection test case.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TemplateCollection fixture = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static void main(String[] args) {
+ TestRunner.run(TemplateCollectionTest.class);
+ }
+
+ /**
+ * Constructs a new Template Collection test case with the given name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public TemplateCollectionTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Sets the fixture for this Template Collection test case.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void setFixture(TemplateCollection fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * Returns the fixture for this Template Collection test case.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TemplateCollection getFixture() {
+ return fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see junit.framework.TestCase#setUp()
+ * @generated
+ */
+ @Override
+ protected void setUp() throws Exception {
+ setFixture(DataTemplateFactory.eINSTANCE.createTemplateCollection());
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+} //TemplateCollectionTest
diff --git a/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateTest.java b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateTest.java
new file mode 100644
index 0000000..5e5c91f
--- /dev/null
+++ b/tests/org.eclipse.emfforms.datatemplate.model.tests/src/org/eclipse/emfforms/datatemplate/tests/TemplateTest.java
@@ -0,0 +1,200 @@
+/**
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * EclipseSource Muenchen GmbH - initial API and implementation
+ */
+package org.eclipse.emfforms.datatemplate.tests;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
+import org.eclipse.emfforms.datatemplate.DataTemplateFactory;
+import org.eclipse.emfforms.datatemplate.DataTemplatePackage;
+import org.eclipse.emfforms.datatemplate.Template;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+
+/**
+ * <!-- begin-user-doc --> A test case for the model object
+ * '<em><b>Template</b></em>'. <!-- end-user-doc -->
+ *
+ * @generated
+ */
+@SuppressWarnings("nls")
+public class TemplateTest extends TestCase {
+
+ /**
+ * The fixture for this Template test case. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ protected Template fixture = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static void main(String[] args) {
+ TestRunner.run(TemplateTest.class);
+ }
+
+ /**
+ * Constructs a new Template test case with the given name. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TemplateTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Sets the fixture for this Template test case. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ protected void setFixture(Template fixture) {
+ this.fixture = fixture;
+ }
+
+ /**
+ * Returns the fixture for this Template test case. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ protected Template getFixture() {
+ return fixture;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#setUp()
+ * @generated
+ */
+ @Override
+ protected void setUp() throws Exception {
+ setFixture(DataTemplateFactory.eINSTANCE.createTemplate());
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see junit.framework.TestCase#tearDown()
+ * @generated
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ setFixture(null);
+ }
+
+ static URL getResourceURL(Class<?> contextClass, String path) {
+ URL result = contextClass.getResource(path);
+
+ if (result == null) {
+ // We're in Eclipse
+ final String contextURL = contextClass.getResource(contextClass.getSimpleName() + ".class")
+ .toExternalForm();
+
+ try {
+ if (path.startsWith("/")) {
+ final String baseURL = contextURL.substring(0, contextURL.lastIndexOf("/bin/"));
+ result = new URL(baseURL + path);
+ } else {
+ final String baseURL = contextURL.substring(0, contextURL.lastIndexOf("/") + 1);
+ result = new URL(baseURL + path);
+ }
+ } catch (final MalformedURLException e) {
+ e.printStackTrace();
+ fail("Could not get resource '" + path + "': " + e.getMessage());
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * Per bug 550814, dynamic instances of the template model must be supported.
+ * This test fails without the fix for 550814 because the EObject class in the
+ * dynamic implementation of Ecore has no relation to the static EObject class.
+ *
+ * @see <a href="http://eclip.se/550814">bug 550814</a>
+ */
+ public void testDynamicInstance() throws IOException {
+ // Load the dynamic Ecore model
+ final ResourceSet rset = new ResourceSetImpl();
+ final URIConverter converter = new ExtensibleURIConverterImpl();
+ rset.setURIConverter(converter);
+ rset.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl());
+ final URL modelURL = getResourceURL(DataTemplatePackage.class, "/model/datatemplate.ecore");
+ URI physicalURI = URI.createURI(modelURL.toExternalForm(), true);
+ final URI modelURI = URI
+ .createPlatformPluginURI("org.eclipse.emfforms.datatemplate.model/model/datatemplate.ecore", true);
+ converter.getURIMap().put(modelURI.trimSegments(2).appendSegment(""),
+ physicalURI.trimSegments(2).appendSegment(""));
+ final Resource model = rset.getResource(modelURI, true);
+
+ // Give the dynamic model the dynamic Ecore that it expects
+ final URL ecoreURL = getResourceURL(EcorePackage.class, "/model/Ecore.ecore");
+ physicalURI = URI.createURI(ecoreURL.toExternalForm(), true);
+ final URI ecoreURI = URI.createPlatformPluginURI("org.eclipse.emf.ecore/model/Ecore.ecore", true);
+ converter.getURIMap().put(ecoreURI.trimSegments(2).appendSegment(""),
+ physicalURI.trimSegments(2).appendSegment(""));
+ rset.getResource(ecoreURI, true);
+
+ // Resolve cross-references to Ecore
+ EcoreUtil.resolveAll(model);
+
+ final EPackage package_ = (EPackage) EcoreUtil.getObjectByType(model.getContents(),
+ EcorePackage.Literals.EPACKAGE);
+ final EClass templateClass = (EClass) package_.getEClassifier("Template");
+ final EReference instance = (EReference) templateClass.getEStructuralFeature("instance");
+
+ try {
+ final EObject template = EcoreUtil.create(templateClass);
+ final EOperation operation = EcoreFactory.eINSTANCE.createEOperation();
+
+ // an EOperation is not an EObject in the Ecore model, but it is in the Java
+ // implementation
+ template.eSet(instance, operation);
+
+ assertThat("Template instance not correctly set", template.eGet(instance), is(operation));
+ } catch (final Exception e) {
+ e.printStackTrace();
+ fail("Failed to set template instance: " + e.getMessage());
+ }
+ }
+
+} // TemplateTest
diff --git a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
index dc0a94f..13b2ff5 100644
--- a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: DataTemplate Tests
Bundle-SymbolicName: org.eclipse.emfforms.datatemplate.tooling.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.datatemplate.tooling;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.datatemplate.tooling;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.datatemplate.tooling.editor;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.datatemplate.tooling.wizard;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.datatemplate.tooling.tests
diff --git a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
index 60f34ad..2c260af 100644
--- a/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.datatemplate.tooling.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.datatemplate.tooling.tests</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
index ba222d9..adc526e 100644
--- a/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.editor.ecore.test/META-INF/MANIFEST.MF
@@ -2,62 +2,62 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Ecore Editor Test
Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)"
+Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)"
Export-Package: org.eclipse.emfforms.spi.editor;version="0.0.0"
Require-Bundle: org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.editor.ecore;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.editor.ecore;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.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.emf.ecp.view.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.setup.base;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.common.validation;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.setup.base;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.common.validation;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table.panel;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.editor.ecore.test
Import-Package: javax.inject;version="1.0.0",
org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.bazaar;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.22.0,1.23.0)";resolution:=optional,
+ org.eclipse.emfforms.bazaar;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.23.0,1.24.0)";resolution:=optional,
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml b/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
index bc69fbe..427a257 100644
--- a/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
+++ b/tests/org.eclipse.emfforms.editor.ecore.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.editor.ecore.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
index fdb9826..6c4e370 100644
--- a/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.editor.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Editor Tests
Bundle-SymbolicName: org.eclipse.emfforms.editor.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.spi.editor;version="1.22.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.editor;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.spi.editor;version="1.23.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.23.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)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.editor.tests
-Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emfforms.editor.test/pom.xml b/tests/org.eclipse.emfforms.editor.test/pom.xml
index b11aca6..9c9bce9 100644
--- a/tests/org.eclipse.emfforms.editor.test/pom.xml
+++ b/tests/org.eclipse.emfforms.editor.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.editor.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
index 5d674ed..eace218 100644
--- a/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.builder.test/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test plugin for EMFForms IDE Builder
Bundle-SymbolicName: org.eclipse.emfforms.ide.builder.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.ide.builder;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.ide.builder.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.ide.builder;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.ide.builder.test;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.eclipse.core.resources;bundle-version="[3.12.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emfforms.ide.builder;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.ide.builder;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.common.ui;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.common;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emfforms.core.bazaar;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.bazaar;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.13.0,3.0.0)",
org.hamcrest.core;bundle-version="[1.3.0,2.0.0)",
org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.ide.builder.test
-Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emfforms.ide.builder.test/pom.xml b/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
index bd7f095..beb1645 100644
--- a/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.builder.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.builder.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
index 7cccc46..da01b51 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Mapping Segment IDE Tooling Tests
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.mappingsegment.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.ide.view.mappingsegment;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.ide.view.mappingsegment;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.ide.view.mappingsegment;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
org.apache.log4j;bundle-version="[1.2.15,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.segments.featurepath;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.ide.view.mappingsegment.test
Import-Package: org.eclipse.swt;version="0.0.0",
diff --git a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
index 4e95f8b..6b6f3cb 100644
--- a/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.mappingsegment.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.view.mappingsegment.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
index 868e897..70a8646 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Multi Segment IDE Tooling Tests (UI Thread)
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment.test.uithread
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.ide.view.multisegment.test.nouithread;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.ide.view.multisegment.test.nouithread;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.ide.view.multisegment.test.nouiharness
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
index 4d72cc1..8a01ed6 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test.uithread/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.view.multisegment.test.uithread</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
index ecf4fae..0139834 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Multi Segment IDE Tooling Tests
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.multisegment.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.ide.view.multisegment.test;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.ide.view.multisegment;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.ide.view.multisegment.test;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.multisegment.tooling;version="1.23.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.objenesis;bundle-version="[1.0.0,2.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
org.apache.log4j;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
org.eclipse.swtbot.junit4_x;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.ide.view.multisegment.test
diff --git a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
index 8d70d82..ae3db1a 100644
--- a/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.multisegment.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.view.multisegment.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
index c023a4e..d8a4405 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Segments IDE Tooling TESTS
Bundle-SymbolicName: org.eclipse.emfforms.ide.view.segments.test;singleton:=true
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.ide.view.segments;bundle-version="[1.22.0,1.23.0)"
-Automatic-Module-Name: org.eclipse.emfforms.ide.view.segments.test
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Fragment-Host: org.eclipse.emfforms.ide.view.segments;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.21.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.ide.view.segments;version="1.21.0"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.emfforms.ide.view.segments.test
diff --git a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
index f5e11be..5f8d0f8 100644
--- a/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
+++ b/tests/org.eclipse.emfforms.ide.view.segments.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.ide.view.segments.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 16b322c..02666c3 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Localization Tests
Bundle-SymbolicName: org.eclipse.emfforms.localization.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.23.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 583bbc2..ee468fe 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
index f9d7a58..c522720 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Rule Repository Tooling Test
Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.rulerepository.tooling;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.rulerepository.tooling.test;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.rulerepository.tooling;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.rulerepository.tooling.test;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
index b613f6c..fbaec74 100644
--- a/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
+++ b/tests/org.eclipse.emfforms.rulerepository.tooling.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.rulerepository.tooling.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
<build>
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
index b101202..e6da0d7 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SDK Integration Test
Bundle-SymbolicName: org.eclipse.emfforms.sdk.integration.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: EMFForms Cell Editor Tests
Automatic-Module-Name: org.eclipse.emfforms.sdk.integration.test
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
@@ -10,4 +10,4 @@
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.felix.scr;version="[1.3.0,2.0.0)",
org.osgi.framework;version="[1.5.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.sdk.integration.test;version="1.22.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.sdk.integration.test;version="1.23.0";x-internal:=true
diff --git a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
index 093214f..f1d1aef 100644
--- a/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
+++ b/tests/org.eclipse.emfforms.sdk.integration.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.sdk.integration.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
index ba4e85f..611c686 100644
--- a/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.common.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Common Test Helper
Bundle-SymbolicName: org.eclipse.emfforms.swt.common.test
-Bundle-Version: 1.22.0.qualifier
-Export-Package: org.eclipse.emfforms.swt.common.test;version="1.22.0"
+Bundle-Version: 1.23.0.qualifier
+Export-Package: org.eclipse.emfforms.swt.common.test;version="1.23.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.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.swt.common.test/pom.xml b/tests/org.eclipse.emfforms.swt.common.test/pom.xml
index b156bd4..23f3750 100644
--- a/tests/org.eclipse.emfforms.swt.common.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.common.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.swt.common.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<build>
<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
index bdf2dfd..1469f02 100644
--- a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for EMFForms SWT Renderer for Multi EAttributes
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.multiattribute.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.spi.view.control.multiattribute;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.spi.view.control.multiattribute;version="1.23.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.hamcrest.library;bundle-version="1.3.0",
- org.eclipse.emfforms.localization;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.control.multiattribute.tests
diff --git a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
index 849dd30..251a971 100644
--- a/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.multiattribute.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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.multiattribute.tests</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.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 963e339..37360ba 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,14 +2,14 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.22.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.control.text.autocomplete.tests
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 60ba8c0..3e5acec 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 f05815a..148d7b9 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Control Grid SWT Renderer Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.23.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.22.0,1.23.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.controlgrid.test
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
index c4a8bcc..3040515 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 09aa3ed..e9b4be5 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 @@
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.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.22.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.23.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.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 d1a4f3a..074d685 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 38940c1..679157a 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core DI Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.tests
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.22.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
- org.eclipse.emfforms.spi.swt.core.di;version="1.22.0"
-Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.22.0,1.23.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.23.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
+ org.eclipse.emfforms.spi.swt.core.di;version="1.23.0"
+Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Service-Component: OSGI-INF/testControlSWTRendererServiceDI.xml
@@ -26,8 +26,8 @@
Import-Package: javax.inject;version="1.0.0",
org.eclipse.e4.core.di;version="0.0.0",
org.eclipse.e4.core.di.annotations;version="0.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.common.di.annotations;version="[1.23.0,1.24.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="1.8.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 f98a35a..38c3506 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 b7902da..af7cb0c 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,21 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.22.0",
- org.eclipse.emfforms.swt.core.tests;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.ui;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.23.0",
+ org.eclipse.emfforms.swt.core.tests;version="1.23.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.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.core.tests
Import-Package: org.eclipse.e4.core.contexts;version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.label.model;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.spi.vertical.model;version="1.22.0",
- org.eclipse.emf.ecp.view.test.common.spi;version="1.22.0",
+ org.eclipse.emf.ecp.test.common;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.label.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.spi.vertical.model;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.test.common.spi;version="[1.23.0,1.24.0)",
org.osgi.framework;version="[1.6.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
index f987fd0..bdf9532 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
@@ -22,11 +22,38 @@
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
+ <includes>
+ <include>**/*_PTest.java</include>
+ <include>**/*_ITest.java</include>
+ <!-- Execute SWT-Related tests with tycho surefire -->
+ <include>**/SWTValidationUiServiceImpl_Test.java</include>
+ </includes>
<useUIHarness>false</useUIHarness>
<useUIThread>false</useUIThread>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${mav-surefire-version}</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <configuration>
+ <testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
+ <excludes>
+ <!-- Executed with tycho surefire -->
+ <exclude>**/SWTValidationUiServiceImpl_Test.java</exclude>
+ </excludes>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl_Test.java b/tests/org.eclipse.emfforms.swt.core.tests/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl_Test.java
new file mode 100644
index 0000000..a8f087f
--- /dev/null
+++ b/tests/org.eclipse.emfforms.swt.core.tests/src/org/eclipse/emfforms/internal/swt/core/ui/SWTValidationUiServiceImpl_Test.java
@@ -0,0 +1,344 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Lucas Koehler - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.swt.core.ui;
+
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+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.swt.core.ui.SWTValidationHelper;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link SWTValidationUiServiceImpl}.
+ *
+ * @author Lucas Koehler
+ *
+ */
+public class SWTValidationUiServiceImpl_Test {
+
+ private SWTValidationHelper validationHelper;
+ private SWTValidationUiServiceImpl fixture;
+ private VElement vElement;
+ private ViewModelContext viewContext;
+
+ @Before
+ public void setUp() {
+ validationHelper = mock(SWTValidationHelper.class);
+ fixture = new SWTValidationUiServiceImpl(validationHelper);
+ vElement = mock(VElement.class);
+ viewContext = mock(ViewModelContext.class);
+ }
+
+ /**
+ * Test that getValidationIcon(VElement, ViewModelContext) correctly delegates to getValidationIcon(Diagnostic,
+ * VElement, ViewModelContext) and that the latter correctly delegates to SWTValidationHelper.
+ */
+ @Test
+ public void getValidationIcon() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+ final Diagnostic ok = mock(Diagnostic.class);
+ when(ok.getSeverity()).thenReturn(Diagnostic.OK);
+ final Diagnostic error = mock(Diagnostic.class);
+ when(error.getSeverity()).thenReturn(Diagnostic.ERROR);
+ vDiagnostic.getDiagnostics().add(ok);
+ vDiagnostic.getDiagnostics().add(error);
+ when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+ final Image expected = new Image(Display.getDefault(), 1, 1);
+ when(validationHelper.getValidationIcon(Diagnostic.ERROR, vElement, viewContext)).thenReturn(expected);
+
+ final Image result = spiedFixture.getValidationIcon(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationIcon(error, vElement, viewContext);
+ }
+
+ /** If the VElement doesn't have a VDiagnostic, it should be assumed that there is no validation error. */
+ @Test
+ public void getValidationIcon_nullVDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ when(vElement.getDiagnostic()).thenReturn(null);
+ final Image expected = new Image(Display.getDefault(), 1, 1);
+ when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Image result = spiedFixture.getValidationIcon(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationIcon(Diagnostic.OK_INSTANCE, vElement, viewContext);
+ }
+
+ /**
+ * If the VElement's VDiagnostic doesn't have any Diagnostics, it should be assumed that there is no validation
+ * error.
+ */
+ @Test
+ public void getValidationIcon_emptyVDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+ when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+ final Image expected = new Image(Display.getDefault(), 1, 1);
+ when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Image result = spiedFixture.getValidationIcon(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationIcon(Diagnostic.OK_INSTANCE, vElement, viewContext);
+ }
+
+ /**
+ * If the given Diagnostic is null, it should be assumed that there is no validation error.
+ */
+ @Test
+ public void getValidationIcon_nullDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final Image expected = new Image(Display.getDefault(), 1, 1);
+ when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Image result = spiedFixture.getValidationIcon(null, vElement, viewContext);
+
+ assertSame(expected, result);
+ }
+
+ /** The service should cache icons by severity. */
+ @Test
+ public void getValidationIcon_caching() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final Image expected = new Image(Display.getDefault(), 1, 1);
+ when(validationHelper.getValidationIcon(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+ final Diagnostic ok1 = mock(Diagnostic.class);
+ when(ok1.getSeverity()).thenReturn(Diagnostic.OK);
+ final Diagnostic ok2 = mock(Diagnostic.class);
+ when(ok2.getSeverity()).thenReturn(Diagnostic.OK);
+
+ final Image result1 = spiedFixture.getValidationIcon(ok1, vElement, viewContext);
+ final Image result2 = spiedFixture.getValidationIcon(ok2, vElement, viewContext);
+
+ assertSame(expected, result1);
+ assertSame(expected, result2);
+ // if caching is used, the validation helper only needs to be called once
+ verify(validationHelper, times(1)).getValidationIcon(Diagnostic.OK, vElement, viewContext);
+ }
+
+ /**
+ * Test that getValidationForegroundColor(VElement, ViewModelContext) correctly delegates to
+ * getValidationForegroundColor(Diagnostic, VElement, ViewModelContext) and that the latter correctly delegates to
+ * SWTValidationHelper.
+ */
+ @Test
+ public void getValidationForegroundColor() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+ final Diagnostic ok = mock(Diagnostic.class);
+ when(ok.getSeverity()).thenReturn(Diagnostic.OK);
+ final Diagnostic error = mock(Diagnostic.class);
+ when(error.getSeverity()).thenReturn(Diagnostic.ERROR);
+ vDiagnostic.getDiagnostics().add(ok);
+ vDiagnostic.getDiagnostics().add(error);
+ when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationForegroundColor(Diagnostic.ERROR, vElement, viewContext))
+ .thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationForegroundColor(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationForegroundColor(error, vElement, viewContext);
+ }
+
+ /** If the VElement doesn't have a VDiagnostic, it should be assumed that there is no validation error. */
+ @Test
+ public void getValidationForegroundColor_nullVDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ when(vElement.getDiagnostic()).thenReturn(null);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationForegroundColor(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationForegroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+ }
+
+ /**
+ * If the VElement's VDiagnostic doesn't have any Diagnostics, it should be assumed that there is no validation
+ * error.
+ */
+ @Test
+ public void getValidationForegroundColor_emptyVDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+ when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationForegroundColor(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationForegroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+ }
+
+ /**
+ * If the given Diagnostic is null, it should be assumed that there is no validation error.
+ */
+ @Test
+ public void getValidationForegroundColor_nullDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationForegroundColor(null, vElement, viewContext);
+
+ assertSame(expected, result);
+ }
+
+ /** The service should cache icons by severity. */
+ @Test
+ public void getValidationForegroundColor_caching() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationForegroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+ final Diagnostic ok1 = mock(Diagnostic.class);
+ when(ok1.getSeverity()).thenReturn(Diagnostic.OK);
+ final Diagnostic ok2 = mock(Diagnostic.class);
+ when(ok2.getSeverity()).thenReturn(Diagnostic.OK);
+
+ final Color result1 = spiedFixture.getValidationForegroundColor(ok1, vElement, viewContext);
+ final Color result2 = spiedFixture.getValidationForegroundColor(ok2, vElement, viewContext);
+
+ assertSame(expected, result1);
+ assertSame(expected, result2);
+ // if caching is used, the validation helper only needs to be called once
+ verify(validationHelper, times(1)).getValidationForegroundColor(Diagnostic.OK, vElement, viewContext);
+ }
+
+ /**
+ * Test that getValidationBackgroundColor(VElement, ViewModelContext) correctly delegates to
+ * getValidationBackgroundColor(Diagnostic, VElement, ViewModelContext) and that the latter correctly delegates to
+ * SWTValidationHelper.
+ */
+ @Test
+ public void getValidationBackgroundColor() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+ final Diagnostic ok = mock(Diagnostic.class);
+ when(ok.getSeverity()).thenReturn(Diagnostic.OK);
+ final Diagnostic error = mock(Diagnostic.class);
+ when(error.getSeverity()).thenReturn(Diagnostic.ERROR);
+ vDiagnostic.getDiagnostics().add(ok);
+ vDiagnostic.getDiagnostics().add(error);
+ when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationBackgroundColor(Diagnostic.ERROR, vElement, viewContext))
+ .thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationBackgroundColor(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationBackgroundColor(error, vElement, viewContext);
+ }
+
+ /** If the VElement doesn't have a VDiagnostic, it should be assumed that there is no validation error. */
+ @Test
+ public void getValidationBackgroundColor_nullVDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ when(vElement.getDiagnostic()).thenReturn(null);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationBackgroundColor(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationBackgroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+ }
+
+ /**
+ * If the VElement's VDiagnostic doesn't have any Diagnostics, it should be assumed that there is no validation
+ * error.
+ */
+ @Test
+ public void getValidationBackgroundColor_emptyVDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final VDiagnostic vDiagnostic = VViewFactory.eINSTANCE.createDiagnostic();
+ when(vElement.getDiagnostic()).thenReturn(vDiagnostic);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationBackgroundColor(vElement, viewContext);
+
+ assertSame(expected, result);
+ verify(spiedFixture).getValidationBackgroundColor(Diagnostic.OK_INSTANCE, vElement, viewContext);
+ }
+
+ /**
+ * If the given Diagnostic is null, it should be assumed that there is no validation error.
+ */
+ @Test
+ public void getValidationBackgroundColor_nullDiagnostic() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+
+ final Color result = spiedFixture.getValidationBackgroundColor(null, vElement, viewContext);
+
+ assertSame(expected, result);
+ }
+
+ /** The service should cache icons by severity. */
+ @Test
+ public void getValidationBackgroundColor_caching() {
+ // Spy to be able to verify method calls
+ final SWTValidationUiServiceImpl spiedFixture = spy(fixture);
+ final Color expected = new Color(Display.getDefault(), 1, 2, 3);
+ when(validationHelper.getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext)).thenReturn(expected);
+ final Diagnostic ok1 = mock(Diagnostic.class);
+ when(ok1.getSeverity()).thenReturn(Diagnostic.OK);
+ final Diagnostic ok2 = mock(Diagnostic.class);
+ when(ok2.getSeverity()).thenReturn(Diagnostic.OK);
+
+ final Color result1 = spiedFixture.getValidationBackgroundColor(ok1, vElement, viewContext);
+ final Color result2 = spiedFixture.getValidationBackgroundColor(ok2, vElement, viewContext);
+
+ assertSame(expected, result1);
+ assertSame(expected, result2);
+ // if caching is used, the validation helper only needs to be called once
+ verify(validationHelper, times(1)).getValidationBackgroundColor(Diagnostic.OK, vElement, viewContext);
+ }
+}
diff --git a/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
index cc483ae..0c337aa 100644
--- a/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.reference.table.test/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Reference Selection Composite Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.reference.table.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.reference.table;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.22.0",
- org.eclipse.emfforms.swt.reference.table.test;version="1.22.0"
+Fragment-Host: org.eclipse.emfforms.swt.reference.table;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.swt.internal.reference.table;version="1.23.0",
+ org.eclipse.emfforms.swt.reference.table.test;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.7.0,3.0.0)",
org.eclipse.swt;bundle-version="[3.107.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.reference.table.test
-Import-Package: org.eclipse.emf.ecp.spi.common.ui;version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emf.ecp.spi.common.ui;version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;version="[1.23.0,1.24.0)"
diff --git a/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml b/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
index 30cdac7..6f3b820 100644
--- a/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.reference.table.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.reference.table.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
index 83a1728..a6e6518 100644
--- a/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.table.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.table.test
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.table;bundle-version="[1.22.0,1.23.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.table.action;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.22.0",
- org.eclipse.emfforms.spi.swt.table.action;version="1.22.0",
- org.eclipse.emfforms.swt.table.test;version="1.22.0";x-internal:=true
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.table;bundle-version="[1.23.0,1.24.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.table.action;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.23.0",
+ org.eclipse.emfforms.spi.swt.table.action;version="1.23.0",
+ org.eclipse.emfforms.swt.table.test;version="1.23.0";x-internal:=true
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.objenesis;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.table.test
diff --git a/tests/org.eclipse.emfforms.swt.table.test/pom.xml b/tests/org.eclipse.emfforms.swt.table.test/pom.xml
index d416ec2..e518abe 100644
--- a/tests/org.eclipse.emfforms.swt.table.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.table.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.table.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
index 1a47eb0..dbb51ea 100644
--- a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: TreeMasterDetail Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail.test
-Bundle-Version: 1.22.0.qualifier
+Bundle-Version: 1.23.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.swt.treemasterdetail.test;version="1.22.0"
+Export-Package: org.eclipse.emfforms.swt.treemasterdetail.test;version="1.23.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
org.eclipse.jface;bundle-version="[3.13.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
org.eclipse.swtbot.swt.finder;bundle-version="[2.6.0,3.0.0)",
org.eclipse.swtbot.junit4_x;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.23.0,1.24.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.annotation.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.swt.treemasterdetail.test
Import-Package: org.osgi.framework;version="0.0.0"
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
index 7ebb672..d5f104c 100644
--- a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.treemasterdetail.test</artifactId>
- <version>1.22.0-SNAPSHOT</version>
+ <version>1.23.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.treemasterdetail.test/src/org/eclipse/emfforms/swt/treemasterdetail/test/DiagnosticCache_Test.java b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/src/org/eclipse/emfforms/swt/treemasterdetail/test/DiagnosticCache_Test.java
new file mode 100644
index 0000000..707e58e
--- /dev/null
+++ b/tests/org.eclipse.emfforms.swt.treemasterdetail.test/src/org/eclipse/emfforms/swt/treemasterdetail/test/DiagnosticCache_Test.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2019 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 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * eugen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.swt.treemasterdetail.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * DiagnosticCache Test.
+ *
+ * @author Eugen Neufeld
+ *
+ */
+public class DiagnosticCache_Test {
+
+ @Before
+ public void setUp() throws Exception {
+
+ }
+
+ @Test
+ public void testNull() {
+ final EObject object = null;
+ final DiagnosticCache cache = new DiagnosticCache(object);
+ assertEquals(0, cache.getObjects().size());
+ }
+
+ @Test
+ public void testExternalReferences() {
+ final EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage();
+
+ final DiagnosticCache cache = new DiagnosticCache(ePackage);
+ assertEquals(2, cache.getObjects().size());
+ assertTrue(cache.getObjects().contains(ePackage));
+ assertTrue(cache.getObjects().contains(ePackage.getEFactoryInstance()));
+ }
+
+ @Test
+ public void testNoExternalReferences() {
+ final EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+
+ final DiagnosticCache cache = new DiagnosticCache(eClass);
+ assertEquals(1, cache.getObjects().size());
+ assertTrue(cache.getObjects().contains(eClass));
+ }
+}
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 a691485..fb1f739 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,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms View Model Localization Tests
Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization.tests
-Bundle-Version: 1.22.0.qualifier
-Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.22.0,1.23.0)"
+Bundle-Version: 1.23.0.qualifier
+Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.23.0,1.24.0)"
Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.22.0";x-internal:=true,
- org.eclipse.emfforms.view.model.localization.tests;version="1.22.0"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.23.0";x-internal:=true,
+ org.eclipse.emfforms.view.model.localization.tests;version="1.23.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.22.0,1.23.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.23.0,1.24.0)",
org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.view.model.localization.tests
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.22.0,1.23.0)"
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.23.0,1.24.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 7b3b483..38daf23 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.22.0-SNAPSHOT</version>
+ <version>1.23.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.22.0-SNAPSHOT</version>
+ <version>1.23.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 dba3a89..6cfd1d4 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
@@ -7,14 +7,14 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.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.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.22.0,1.23.0)"
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.23.0,1.24.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emfforms.spreadsheet.core.renderer.table.tests
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 1a94260..349f0b8 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
@@ -9,9 +9,9 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.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.8
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 f85a3a5..0598aaa 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,13 +8,13 @@
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.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.22.0,1.23.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.23.0,1.24.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.22.0,1.23.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.23.0,1.24.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,1.1.0)",
