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
<
