Merge branch 'release_1.10.0'
diff --git a/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
index 350ca74..9261afd 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.application3x;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.10.0,2.0.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 e53e420..d026b41 100644
--- a/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e3/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
index 9f4fadc..7db9348 100644
--- a/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.application.e4/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP e4 Application
Bundle-SymbolicName: org.eclipse.emf.ecp.application.e4;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
org.eclipse.equinox.event;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 54eb492..11cfe6a 100644
--- a/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.application.e4/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
index 9f1f771..e1b5438 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
+Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.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 5b03342..e24de94 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
index eba9dc9..45f9139 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.cdo.internal.ui;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.cdo.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
index c74c22b..e631ae0 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.changebroker.provider/META-INF/MANIFEST.MF
index 98afa82..eaee004 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker.provider/pom.xml
index 4ec9f51..04e063e 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 b4d4f30..b3cd6d0 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.changebroker.spi;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.changebroker.spi;version="1.10.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.emf.ecp.changebroker/pom.xml b/bundles/org.eclipse.emf.ecp.changebroker/pom.xml
index 5af1e1c..d7cff29 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 b3819c7..fdeb739 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.common.ui;version="1.9.0",
- org.eclipse.emf.ecp.spi.common.ui.composites;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.common.ui;version="1.10.0",
+ org.eclipse.emf.ecp.spi.common.ui.composites;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/pom.xml b/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
index 18db5ff..15e2457 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common.ui/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/FilteredEClassContentProvider.java b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/FilteredEClassContentProvider.java
index bfedcb6..20135d8 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/FilteredEClassContentProvider.java
+++ b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/FilteredEClassContentProvider.java
@@ -26,24 +26,36 @@
import org.eclipse.jface.viewers.Viewer;
/**
+ * A {@link ITreeContentProvider} to show available {@link EClass}s in a tree. The hierachy will be build based on
+ * {@link EPackage}s. If there is only one {@link EPackage} containing all {@link EClass}s, a flat list will be shown.
+ *
* @author Eugen Neufeld
*
+ *
*/
public class FilteredEClassContentProvider implements ITreeContentProvider {
private final Map<EPackage, Set<EClass>> packageClassesMap = new HashMap<EPackage, Set<EClass>>();
+ /**
+ * Default constructor.
+ *
+ * @param unsupportedEPackages {@link EPackage}s to be ignored completely
+ * @param packagesToBeShown {@link EPackage}s to be shown in the tree, if a package is not in this list, no EClasses
+ * will be shown.
+ * @param eClassesToBeShown {@link EClass}s to be shown.
+ */
public FilteredEClassContentProvider(Collection<EPackage> unsupportedEPackages,
- Collection<EPackage> projectFilteredEPackages, Collection<EClass> projectFilteredEClasss) {
+ Collection<EPackage> packagesToBeShown, Collection<EClass> eClassesToBeShown) {
for (final EPackage ePackage : EMFUtils.getAllRegisteredEPackages()) {
if (unsupportedEPackages.contains(ePackage)) {
continue;
}
- final boolean addToPackages = projectFilteredEPackages.contains(ePackage);
+ final boolean addToPackages = packagesToBeShown.contains(ePackage);
for (final EClassifier classifier : ePackage.getEClassifiers()) {
if (classifier instanceof EClass && !((EClass) classifier).isAbstract()) {
final EClass eClass = (EClass) classifier;
- if (addToPackages || projectFilteredEClasss.contains(eClass)) {
+ if (addToPackages || eClassesToBeShown.contains(eClass)) {
if (!packageClassesMap.containsKey(ePackage)) {
packageClassesMap.put(ePackage, new HashSet<EClass>());
}
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/TreeViewerFactory.java b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/TreeViewerFactory.java
index 68cd8af..59b738e 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/TreeViewerFactory.java
+++ b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/TreeViewerFactory.java
@@ -19,7 +19,7 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
@@ -30,6 +30,17 @@
private TreeViewerFactory() {
}
+ /**
+ * Creates a default {@link TreeViewer}.
+ *
+ * @param parent the parent {@link Composite}
+ * @param labelProvider the {@link ILabelProvider}
+ * @param contentProvider the {@link ITreeContentProvider}
+ * @param input the input of the {@link TreeViewer}
+ * @param labelDecorator the {@link ILabelDecorator}
+ * @param sort if the {@link TreeViewer} shall be sorted
+ * @return the created {@link TreeViewer}
+ */
public static TreeViewer createTreeViewer(Composite parent, ILabelProvider labelProvider,
ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator, boolean sort) {
final TreeViewer viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
@@ -37,6 +48,17 @@
return viewer;
}
+ /**
+ * Creates a default {@link CheckboxTreeViewer}.
+ *
+ * @param parent the parent {@link Composite}
+ * @param labelProvider the {@link ILabelProvider}
+ * @param contentProvider the {@link ITreeContentProvider}
+ * @param input the input of the {@link CheckboxTreeViewer}
+ * @param labelDecorator the {@link ILabelDecorator}
+ * @param sort if the {@link CheckboxTreeViewer} shall be sorted
+ * @return the created {@link CheckboxTreeViewer}
+ */
public static TreeViewer createCheckedTreeViewer(Composite parent, ILabelProvider labelProvider,
ITreeContentProvider contentProvider, Object input, ILabelDecorator labelDecorator, boolean sort) {
final CheckboxTreeViewer viewer = new CheckboxTreeViewer(parent, SWT.MULTI | SWT.H_SCROLL
@@ -57,7 +79,7 @@
viewer.setContentProvider(contentProvider);
viewer.setLabelProvider(labelProvider);
if (sort) {
- viewer.setSorter(new ViewerSorter());
+ viewer.setComparator(new ViewerComparator());
}
viewer.setInput(input);
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 e50b630..051e040 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.9.0",
- org.eclipse.emf.ecp.common.spi.asserts;version="1.9.0",
- org.eclipse.emf.ecp.common.spi.cachetree;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.10.0",
+ org.eclipse.emf.ecp.common.spi.asserts;version="1.10.0",
+ org.eclipse.emf.ecp.common.spi.cachetree;version="1.10.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.common/pom.xml b/bundles/org.eclipse.emf.ecp.common/pom.xml
index 2a7bd6c..9db222d 100644
--- a/bundles/org.eclipse.emf.ecp.common/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.common/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/EMFUtils.java b/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/EMFUtils.java
index 16fddbd..990815e 100644
--- a/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/EMFUtils.java
+++ b/bundles/org.eclipse.emf.ecp.common/src/org/eclipse/emf/ecp/common/spi/EMFUtils.java
@@ -65,7 +65,16 @@
final Set<EPackage> ePackages = new HashSet<EPackage>();
final Set<String> namespaceURIs = new LinkedHashSet<String>(Registry.INSTANCE.keySet());
for (final String nsURI : namespaceURIs) {
- final EPackage ePackage = Registry.INSTANCE.getEPackage(nsURI);
+ EPackage ePackage;
+ try {
+ ePackage = Registry.INSTANCE.getEPackage(nsURI);
+ }
+ // BEGIN SUPRESS CATCH EXCEPTION
+ catch (final Exception ex) {// END SUPRESS CATCH EXCEPTION
+ /* If there is a wrongly configured EPackage the call to getEPackage might throw a runtime exception */
+ /* Catch here, so we can still loop through the whole registry */
+ continue;
+ }
if (ePackage == null) {
/*
* this case is actually possible! we should only collect non null
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 96b9451..768d2ad 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
@@ -14,9 +14,9 @@
import java.util.Collections;
import java.util.HashSet;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.emf.ecore.EObject;
@@ -46,7 +46,7 @@
* @param callback the {@link IExcludedObjectsCallback} to use when checking when to stop
*/
public AbstractCachedTree(IExcludedObjectsCallback callback) {
- nodes = new LinkedHashMap<Object, CachedTreeNode<T>>();
+ nodes = new ConcurrentHashMap<Object, CachedTreeNode<T>>();
rootValue = createdCachedTreeNode(getDefaultValue());
this.excludedCallback = callback;
}
@@ -89,6 +89,10 @@
*/
public Set<EObject> update(EObject eObject, T value) {
+ if (eObject == null) {
+ return Collections.emptySet();
+ }
+
if (excludedCallback.isExcluded(eObject)) {
return Collections.emptySet();
}
@@ -163,6 +167,10 @@
* the default value which is returned via {@link #getDefaultValue()}
*/
public T getCachedValue(Object eObject) {
+ if (eObject == null) {
+ return getDefaultValue();
+ }
+
final CachedTreeNode<T> nodeEntry = nodes.get(eObject);
if (nodeEntry != null) {
@@ -179,9 +187,13 @@
* the {@link EObject} that needs to be removed from the cached tree
*/
public void remove(EObject eObject) {
+ if (eObject == null) {
+ return;
+ }
CachedTreeNode<T> node = nodes.get(eObject);
- final CachedTreeNode<T> parentNode = nodes.get(node.getParent());
+ final Object parentObject = node.getParent();
+ final CachedTreeNode<T> parentNode = parentObject == null ? null : nodes.get(parentObject);
nodes.remove(eObject);
rootValue.removeFromCache(eObject);
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 abe3d27..89f9762 100644
--- a/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Emffilter
Bundle-SymbolicName: org.eclipse.emf.ecp.core.emffilter;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.emffilter.internal;version="1.10.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml b/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
index 2706266..f07bb89 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/internal/DefaultFilter.java b/bundles/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/internal/DefaultFilter.java
index 5cb4767..a8a0c92 100644
--- a/bundles/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/internal/DefaultFilter.java
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/src/org/eclipse/emf/ecp/core/emffilter/internal/DefaultFilter.java
@@ -60,6 +60,8 @@
addEDapt(packages);
+ addXcoreXtext(packages);
+
return packages;
}
@@ -421,4 +423,16 @@
packages.add("http://www.eclipse.org/ecl/platform/commands.ecore"); //$NON-NLS-1$
packages.add("http://www.eclipse.org/ecl/platform/objects.ecore"); //$NON-NLS-1$
}
+
+ private void addXcoreXtext(Set<String> packages) {
+ packages.add("http://www.eclipse.org/emf/2011/Xcore"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/xtext/builderstate/1.0"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/xtext/codetemplate/Codetemplates"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/xtext/trace/debug/1.0"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/xtext/common/JavaVMTypes"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/Xtext/Xbase/XAnnotations"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/xtext/xbase/Xbase"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/2008/Xtext"); //$NON-NLS-1$
+ packages.add("http://www.eclipse.org/xtext/xbase/Xtype"); //$NON-NLS-1$
+ }
}
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 27861b4..9b39dd3 100644
--- a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core RAP Sessionprovider
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.servlet.http;version="0.0.0",
- org.eclipse.emf.ecp.core.rap;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.10.0,2.0.0)",
org.eclipse.rap.rwt;version="0.0.0",
org.eclipse.rap.rwt.service;version="3.0.2"
Service-Component: OSGI-INF/component.xml
diff --git a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/pom.xml
index 81d593a..1f0220b 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 1fdc1fa..f7062b2 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.core.rap;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.runtime;version="0.0.0",
org.eclipse.net4j.util.lifecycle;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.core.rap/pom.xml b/bundles/org.eclipse.emf.ecp.core.rap/pom.xml
index db3c324..3129de9 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 47bf4ba..3175a65 100644
--- a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core
Bundle-SymbolicName: org.eclipse.emf.ecp.core;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0",
- org.eclipse.emf.ecp.core.exceptions;version="1.9.0",
- org.eclipse.emf.ecp.core.util;version="1.9.0",
- org.eclipse.emf.ecp.core.util.observer;version="1.9.0",
- org.eclipse.emf.ecp.internal.core;version="1.9.0";
+Export-Package: org.eclipse.emf.ecp.core;version="1.10.0",
+ org.eclipse.emf.ecp.core.exceptions;version="1.10.0",
+ org.eclipse.emf.ecp.core.util;version="1.10.0",
+ org.eclipse.emf.ecp.core.util.observer;version="1.10.0",
+ org.eclipse.emf.ecp.internal.core;version="1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.core.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.ui",
- org.eclipse.emf.ecp.internal.core.util.observer;version="1.9.0";x-friends:="org.eclipse.emf.ecp.core.rap",
- org.eclipse.emf.ecp.spi.core;version="1.9.0",
- org.eclipse.emf.ecp.spi.core.util;version="1.9.0"
+ org.eclipse.emf.ecp.internal.core.properties;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.core.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.ui",
+ org.eclipse.emf.ecp.internal.core.util.observer;version="1.10.0";x-friends:="org.eclipse.emf.ecp.core.rap",
+ org.eclipse.emf.ecp.spi.core;version="1.10.0",
+ org.eclipse.emf.ecp.spi.core.util;version="1.10.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/ecpProviderRegistry.xml,OSGI-INF/ecpRepositoryManager.xml,OSGI-INF/ecpProjectManager.xml,OSGI-INF/ecpObserverBus.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.core/pom.xml b/bundles/org.eclipse.emf.ecp.core/pom.xml
index b21c531..8d2bfba 100644
--- a/bundles/org.eclipse.emf.ecp.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.core/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diagnostician/META-INF/MANIFEST.MF
index 6717ff9..3669718 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diagnostician;version="1.10.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.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml b/bundles/org.eclipse.emf.ecp.diagnostician/pom.xml
index e78c46b..1eb2ce0 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 034f9ca..c77951f 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: Diff Merge Context
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.context
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.diffmerge.spi.context;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.context;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.diffmerge.spi.context;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.context/pom.xml
index a2783e4..af3a18e 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/CompareControls.java b/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/CompareControls.java
index 156b2f1..98dce6e 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/CompareControls.java
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/CompareControls.java
@@ -61,8 +61,11 @@
*/
public static boolean areEqual(VDomainModelReference left, EObject leftDomainModel, VDomainModelReference right,
EObject rightDomainModel) {
+ @SuppressWarnings("rawtypes")
IObservableValue leftObservableValue;
+ @SuppressWarnings("rawtypes")
IObservableValue rightObservableValue;
+
try {
leftObservableValue = Activator.getDefault().getEMFFormsDatabinding()
.getObservableValue(left, leftDomainModel);
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/DiffMergeModelContextImpl.java b/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/DiffMergeModelContextImpl.java
index 7b2d4e5..5616d12 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/DiffMergeModelContextImpl.java
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/internal/context/DiffMergeModelContextImpl.java
@@ -127,7 +127,7 @@
readAlreadyMerged(mergedReferences);
}
- @SuppressWarnings("deprecation")
+ @SuppressWarnings({ "deprecation", "rawtypes" })
private void readAlreadyMerged(Set<VDomainModelReference> mergedReferences) {
for (final VDomainModelReference domainModelReference : mergedReferences) {
IObservableValue observableValue;
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/spi/context/DefaultMergeUtil.java b/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/spi/context/DefaultMergeUtil.java
index 618c1e9..d1580de 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/spi/context/DefaultMergeUtil.java
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.context/src/org/eclipse/emf/ecp/diffmerge/spi/context/DefaultMergeUtil.java
@@ -53,7 +53,9 @@
*/
@SuppressWarnings("unchecked")
public static void copyValues(VControl from, EObject fromDomainModel, VControl to, EObject toDomainModel) {
+ @SuppressWarnings("rawtypes")
final IObservableValue fromObservableValue;
+ @SuppressWarnings("rawtypes")
final IObservableValue toObservableValue;
try {
fromObservableValue = Activator.getDefault().getEMFFormsDatabinding()
@@ -89,8 +91,7 @@
editingDomain.getCommandStack().execute(
AddCommand.create(editingDomain, toEObject, toStructuralFeature,
(Collection<?>) fromEObject.eGet(fromStructuralFeature, true)));
- }
- else {
+ } else {
editingDomain.getCommandStack().execute(
SetCommand.create(editingDomain, toEObject, toStructuralFeature,
fromEObject.eGet(fromStructuralFeature, true)));
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 83e2759..1d991ca 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/pom.xml
index b01de1d..cd11656 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 ea6ba5c..5e91b4c 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.9.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.10.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.10.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.model/pom.xml
index 6a1b374..7a4fa9e 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 20cbf70..0ca2609 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: DiffMerge Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.renderer.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.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.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.10.0,2.0.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 d43f2f8..2ce39ca 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/src/org/eclipse/emf/ecp/diffmerge/internal/renderer/swt/SWTDiffMergeAdditionTester.java b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/src/org/eclipse/emf/ecp/diffmerge/internal/renderer/swt/SWTDiffMergeAdditionTester.java
index 068e494..4c100d1 100644
--- a/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/src/org/eclipse/emf/ecp/diffmerge/internal/renderer/swt/SWTDiffMergeAdditionTester.java
+++ b/bundles/org.eclipse.emf.ecp.diffmerge.renderer.swt/src/org/eclipse/emf/ecp/diffmerge/internal/renderer/swt/SWTDiffMergeAdditionTester.java
@@ -44,6 +44,7 @@
return false;
}
final VControl control = (VControl) vElement;
+ @SuppressWarnings("rawtypes")
IValueProperty valueProperty;
try {
valueProperty = Activator.getInstance().getEMFFormsDatabinding()
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 0d6aa5b..668b747 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.diffmerge.renderer.swt"
+Export-Package: org.eclipse.emf.ecp.diffmerge.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml b/bundles/org.eclipse.emf.ecp.diffmerge.swt/pom.xml
index 2bf484d..2a2b4fc 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 572d3ab..fa20cbb 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.9.0.qualifier
+Bundle-Version: 1.10.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 156814e..6482f11 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 9b351ba..eb1b173 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.102.1,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.eclipse.emf.ecore.presentation;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml b/bundles/org.eclipse.emf.ecp.ecore.editor.ui/pom.xml
index 1f458ad..149bdc0 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 587a802..c8286b5 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.9.0.qualifier
+Bundle-Version: 1.10.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 40f5640..a3b1588 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 55b4531..2d5eaa2 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,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Editor controls for Ecore Elements
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.ecore.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.10.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.9.0,2.0.0)",
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 39bca1f..ea32496 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 b30f8a4..43e8ad2 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
- org.eclipse.emf.ecp.edit.internal.swt.actions;version="1.9.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.9.0";
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.10.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.edit.internal.swt.actions;version="1.10.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.10.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.9.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.9.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.9.0";
+ org.eclipse.emf.ecp.edit.internal.swt.reference;version="1.10.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.10.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.10.0";
x-friends:="org.eclipse.emf.ecp.editor,
org.eclipse.emf.ecp.explorereditorbridge,
org.eclipse.emf.ecp.ui.view.swt,
@@ -25,24 +25,24 @@
org.eclipse.emf.ecp.view.categorization.swt,
org.eclipse.emf.ecp.view.treemasterdetail.ui.swt,
org.eclipse.emf.ecp.view.core.swt",
- org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.9.0",
- org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.9.0",
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.9.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="1.9.0"
+ org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.10.0",
+ org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.10.0",
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.10.0",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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/icons/validation_warning.png b/bundles/org.eclipse.emf.ecp.edit.swt/icons/validation_warning.png
new file mode 100644
index 0000000..628cf2d
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/icons/validation_warning.png
Binary files differ
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
index ab4e99a..fc78028 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java
index c34d11f..54c0084 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/MultiControl.java
@@ -271,6 +271,61 @@
*
*/
private final class ListChangeListener implements IListChangeListener {
+ /**
+ * @author jonas
+ *
+ */
+ private final class ListDiffVisitorExtension extends ListDiffVisitor {
+ private int widthBeforeChange = -1; // initial negative value
+
+ @Override
+ public void handleRemove(int index, Object element) {
+ updateIndicesAfterRemove(index);
+ triggerScrollbarUpdate();
+ updateTargets();
+ }
+
+ private void updateTargets() {
+ for (final WidgetWrapper widgetWrapper : widgetWrappers) {
+ widgetWrapper.widget.getDataBindingContext().updateTargets();
+ }
+ }
+
+ @Override
+ public void handleAdd(int index, Object element) {
+ if (sectionComposite.isDisposed()) {
+ return;
+ }
+ addControl();
+
+ sectionComposite.layout();
+ triggerScrollbarUpdate();
+ updateTargets();
+ }
+
+ @Override
+ public void handleMove(int oldIndex, int newIndex, Object element) {
+ updateTargets();
+ }
+
+ @Override
+ public void handleReplace(int index, Object oldElement, Object newElement) {
+ widgetWrappers.get(index).widget.getDataBindingContext().updateTargets();
+ }
+
+ private void triggerScrollbarUpdate() {
+ if (sectionComposite.isDisposed()) {
+ return;
+ }
+ final int widthAfterChange = sectionComposite.getSize().x;
+ if (widthBeforeChange != widthAfterChange) {
+ scrolledComposite
+ .setMinHeight(sectionComposite.computeSize(widthAfterChange, SWT.DEFAULT).y);
+ widthBeforeChange = widthAfterChange;
+ }
+ }
+ }
+
private final ScrolledComposite scrolledComposite;
/**
@@ -283,57 +338,7 @@
@Override
public void handleListChange(ListChangeEvent event) {
final ListDiff diff = event.diff;
- diff.accept(new ListDiffVisitor() {
-
- private int widthBeforeChange = -1; // initial negative value
-
- @Override
- public void handleRemove(int index, Object element) {
- updateIndicesAfterRemove(index);
- triggerScrollbarUpdate();
- updateTargets();
- }
-
- private void updateTargets() {
- for (final WidgetWrapper widgetWrapper : widgetWrappers) {
- widgetWrapper.widget.getDataBindingContext().updateTargets();
- }
- }
-
- @Override
- public void handleAdd(int index, Object element) {
- if (sectionComposite.isDisposed()) {
- return;
- }
- addControl();
-
- sectionComposite.layout();
- triggerScrollbarUpdate();
- updateTargets();
- }
-
- @Override
- public void handleMove(int oldIndex, int newIndex, Object element) {
- updateTargets();
- }
-
- @Override
- public void handleReplace(int index, Object oldElement, Object newElement) {
- widgetWrappers.get(index).widget.getDataBindingContext().updateTargets();
- }
-
- private void triggerScrollbarUpdate() {
- if (sectionComposite.isDisposed()) {
- return;
- }
- final int widthAfterChange = sectionComposite.getSize().x;
- if (widthBeforeChange != widthAfterChange) {
- scrolledComposite
- .setMinHeight(sectionComposite.computeSize(widthAfterChange, SWT.DEFAULT).y);
- widthBeforeChange = widthAfterChange;
- }
- }
- });
+ diff.accept(new ListDiffVisitorExtension());
}
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableViewerColumnBuilder.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableViewerColumnBuilder.java
index 6a94991..ccdc245 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableViewerColumnBuilder.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableViewerColumnBuilder.java
@@ -35,45 +35,87 @@
private Integer width;
private Integer style = SWT.NONE;
+ /**
+ * Creates a new {@link TableViewerColumnBuilder} instance.
+ *
+ * @return the new instance
+ */
public static TableViewerColumnBuilder create() {
return new TableViewerColumnBuilder();
}
+ /**
+ * @param text the column text
+ * @return self
+ */
public TableViewerColumnBuilder setText(String text) {
this.text = text;
return this;
}
+ /**
+ * @param tooltip the column tooltip
+ * @return self
+ */
public TableViewerColumnBuilder setToolTipText(String tooltip) {
this.tooltip = tooltip;
return this;
}
+ /**
+ * @param isResizable whether the column is resizeable
+ * @return self
+ */
public TableViewerColumnBuilder setResizable(boolean isResizable) {
this.isResizable = isResizable;
return this;
}
+ /**
+ * @param isMoveable whether the column is moveable
+ * @return self
+ */
public TableViewerColumnBuilder setMoveable(boolean isMoveable) {
this.isMoveable = isMoveable;
return this;
}
+ /**
+ * Sets data on the column.
+ *
+ * @param key the key
+ * @param value the value
+ * @return self
+ */
public TableViewerColumnBuilder setData(String key, Object value) {
data.put(key, value);
return this;
}
+ /**
+ * @param style the swt style bits for the column
+ * @return self
+ */
public TableViewerColumnBuilder setStyle(int style) {
this.style = style;
return this;
}
+ /**
+ * @param width the width of the column
+ * @return self
+ */
public TableViewerColumnBuilder setWidth(int width) {
this.width = width;
return this;
}
+ /**
+ * Creates and returns a {@link TableViewerColumn}.
+ *
+ * @param tableViewer the parent
+ * @return the column
+ */
public TableViewerColumn build(TableViewer tableViewer) {
final TableViewerColumn column = new TableViewerColumn(tableViewer, style);
setText(column);
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCustomUpdateCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCustomUpdateCellEditor.java
new file mode 100644
index 0000000..4c024af
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCustomUpdateCellEditor.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.edit.spi.swt.table;
+
+import org.eclipse.jface.viewers.ViewerCell;
+
+/**
+ * If a {@link ECPCellEditor} additionally implements this interface, the cell editor instance will be notified when
+ * a cell's label and image need to be updated.
+ *
+ * @author Alexandra Buzila
+ * @since 1.10
+ *
+ */
+public interface ECPCustomUpdateCellEditor {
+
+ /**
+ * Update the label and image for the given cell.
+ *
+ * @param cell the {@link ViewerCell}
+ * @param value the new value of the cell
+ */
+ void updateCell(ViewerCell cell, Object value);
+}
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 fa6ada9..1f46709 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -96,6 +96,49 @@
}
/**
+ * Returns the foreground color for a control with the given validation severity, VElement
+ * and view model context, if applicable.
+ *
+ * @param severity severity the severity of the {@link Diagnostic}
+ * @param vElement The {@link VElement} that is being rendered
+ * @param viewModelContext The corresponding {@link ViewModelContext}
+ * @return the color to be used as a foreground color
+ * @since 1.10
+ */
+ public Color getValidationForegroundColor(int severity, VElement vElement, ViewModelContext viewModelContext) {
+ final VTControlValidationTemplate template = getTemplate().getControlValidationConfiguration();
+ String colorHex = null;
+
+ switch (severity) {
+ case Diagnostic.OK:
+ colorHex = getOkForegroundColorHEX(template, vElement, viewModelContext);
+ break;
+ case Diagnostic.INFO:
+ colorHex = getInfoForegroundColorHEX(template, vElement, viewModelContext);
+ break;
+ case Diagnostic.WARNING:
+ colorHex = getWarningForegroundColorHEX(template, vElement, viewModelContext);
+ break;
+ case Diagnostic.ERROR:
+ colorHex = getErrorForegroundColorHEX(template, vElement, viewModelContext);
+ break;
+ case Diagnostic.CANCEL:
+ colorHex = getCancelForegroundColorHEX(template, vElement, viewModelContext);
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "The specified severity value " + severity + " is invalid. See Diagnostic class."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (colorHex == null) {
+ return null;
+ }
+ if (!colorMap.containsKey(colorHex)) {
+ colorMap.put(colorHex, getColor(colorHex));
+ }
+ return colorMap.get(colorHex);
+ }
+
+ /**
* Returns the background color for a control with the given validation severity.
*
* @param severity severity the severity of the {@link Diagnostic}
@@ -106,6 +149,17 @@
}
/**
+ * Returns the foreground color for a control with the given validation severity.
+ *
+ * @param severity severity the severity of the {@link Diagnostic}
+ * @return the color to be used as a foreground color
+ * @since 1.10
+ */
+ public Color getValidationForegroundColor(int severity) {
+ return getValidationForegroundColor(severity, null, null);
+ }
+
+ /**
* Returns the hex color for a control with the given validation severity, VElement
* and view model context, if applicable.
*
@@ -263,6 +317,20 @@
return colorHex;
}
+ private String getOkForegroundColorHEX(VTControlValidationTemplate template, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (template != null) {
+ colorHex = template.getOkForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getOkForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
private String getInfoColorHEX(VTControlValidationTemplate template, VElement vElement,
ViewModelContext viewModelContext) {
String colorHex = null;
@@ -277,6 +345,20 @@
return colorHex;
}
+ private String getInfoForegroundColorHEX(VTControlValidationTemplate template, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (template != null) {
+ colorHex = template.getInfoForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getInfoForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
private String getWarningColorHEX(VTControlValidationTemplate template, VElement vElement,
ViewModelContext viewModelContext) {
String colorHex = null;
@@ -291,6 +373,20 @@
return colorHex;
}
+ private String getWarningForegroundColorHEX(VTControlValidationTemplate template, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (template != null) {
+ colorHex = template.getWarningForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getWarningForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
private String getErrorColorHEX(VTControlValidationTemplate template, VElement vElement,
ViewModelContext viewModelContext) {
String colorHex = null;
@@ -305,6 +401,20 @@
return colorHex;
}
+ private String getErrorForegroundColorHEX(VTControlValidationTemplate template, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (template != null) {
+ colorHex = template.getErrorForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getErrorForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
private String getCancelColorHEX(VTControlValidationTemplate template, VElement vElement,
ViewModelContext viewModelContext) {
String colorHex = null;
@@ -319,6 +429,20 @@
return colorHex;
}
+ private String getCancelForegroundColorHEX(VTControlValidationTemplate template, VElement vElement,
+ ViewModelContext viewModelContext) {
+ String colorHex = null;
+ final VTValidationStyleProperty validationStyleProperty = getValidationStyleProperty(vElement,
+ viewModelContext);
+ if (template != null) {
+ colorHex = template.getCancelForegroundColorHEX();
+ }
+ if (validationStyleProperty != null) {
+ colorHex = validationStyleProperty.getCancelForegroundColorHEX();
+ }
+ return colorHex;
+ }
+
private String getOkImageURL(VTControlValidationTemplate template, VElement vElement,
ViewModelContext viewModelContext) {
String imageURL = null;
@@ -494,6 +618,8 @@
.getResource("icons/validation_error.png").toExternalForm()); //$NON-NLS-1$
validationTemplate.setErrorOverlayURL(Activator.getDefault().getBundle()
.getResource("icons/error_decorate.png").toExternalForm()); //$NON-NLS-1$
+ validationTemplate.setWarningImageURL(Activator.getDefault().getBundle()
+ .getResource("icons/validation_warning.png").toExternalForm()); //$NON-NLS-1$
validationTemplate.setWarningOverlayURL(Activator.getDefault().getBundle()
.getResource("icons/warning_decorate.png").toExternalForm()); //$NON-NLS-1$
validationTemplate.setInfoOverlayURL(Activator.getDefault().getBundle()
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 1b88b51..a7d6aec 100644
--- a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emf.ecp.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0",
- org.eclipse.emf.ecp.edit.spi.util;version="1.9.0",
- org.eclipse.emf.ecp.internal.edit;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.spi;version="1.10.0",
+ org.eclipse.emf.ecp.edit.spi.util;version="1.10.0",
+ org.eclipse.emf.ecp.internal.edit;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/ecpControlFactory.xml,OSGI-INF/org.eclipse.emf.ecp.internal.edit.DeleteServiceFactoryImpl.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/org.eclipse.emf.ecp.edit/pom.xml b/bundles/org.eclipse.emf.ecp.edit/pom.xml
index ccdc9c2..8ec5fe7 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/ECPAbstractControl.java b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/ECPAbstractControl.java
index 87fd332..a80b3c1 100644
--- a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/ECPAbstractControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/edit/spi/ECPAbstractControl.java
@@ -197,6 +197,7 @@
*/
public final Setting getFirstSetting() {
if (firstSetting == null) {
+ @SuppressWarnings("rawtypes")
IObservableValue observableValue;
try {
observableValue = Activator.getDefault().getEMFFormsDatabinding()
@@ -224,6 +225,7 @@
*/
public final EStructuralFeature getFirstStructuralFeature() {
if (firstFeature == null) {
+ @SuppressWarnings("rawtypes")
IValueProperty valueProperty;
try {
valueProperty = Activator.getDefault().getEMFFormsDatabinding()
@@ -371,7 +373,7 @@
* @param diagnostic of type Diagnostic
* @deprecated
* @since 1.2
- * **/
+ **/
@Deprecated
public void handleValidation(Diagnostic diagnostic) {
// do nothing
diff --git a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/internal/edit/ControlFactoryImpl.java b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/internal/edit/ControlFactoryImpl.java
index b835047..acde7d6 100644
--- a/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/internal/edit/ControlFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.edit/src/org/eclipse/emf/ecp/internal/edit/ControlFactoryImpl.java
@@ -218,6 +218,7 @@
if (domainModelReference == null) {
return bestCandidate;
}
+ @SuppressWarnings("rawtypes")
IObservableValue observableValue;
try {
observableValue = Activator.getDefault().getEMFFormsDatabinding()
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 f9391bb..3bd0d90 100644
--- a/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.editor.internal.e3;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.editor.e3;version="1.10.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.editor.internal.e3;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 2ca72f5..1105da6 100644
--- a/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
index eaa9f00..19c01c4 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/META-INF/MANIFEST.MF
@@ -11,11 +11,12 @@
Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="[2.8.0,3.0.0)",
org.eclipse.xtend.lib;bundle-version="[2.8.0,3.0.0)",
org.eclipse.xtend.lib.macro;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="1.9.0",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="1.9.0"
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
index 37a3c86..599ab03 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
index 7bfe756..bb3bda2 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/META-INF/MANIFEST.MF
@@ -9,13 +9,13 @@
org.eclipse.emf.ecp.emf2web.ui.json.internal.handler;version="1.0.0";x-internal:=true,
org.eclipse.emf.ecp.emf2web.ui.json.internal.messages;version="1.0.0";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.emf.ecp.emf2web.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecp.emf2web.ui;bundle-version="[1.0.0,1.1.0)",
org.eclipse.core.resources;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,1.1.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
index 5b99117..8670f85 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 26ca5cf..54dfcdf 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Export-Package: org.eclipse.emf.ecp.emf2web.ui.handler;version="1.0.0",
org.eclipse.emf.ecp.emf2web.ui.messages;version="1.0.0";x-internal:=true,
org.eclipse.emf.ecp.emf2web.ui.wizard;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)",
org.eclipse.core.databinding;bundle-version="[1.5.0,2.0.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.5.0,2.0.0)",
@@ -15,7 +15,7 @@
org.eclipse.equinox.common;bundle-version="[3.7.0,4.0.0)",
com.ibm.icu;bundle-version="[54.1.0,60.0.0)",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.common.ui;bundle-version="[2.10.0,3.0.0)",
org.eclipse.core.resources;bundle-version="[3.10.1,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)"
@@ -24,3 +24,4 @@
org.eclipse.jface.databinding.wizard;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
index f7132ce..6e18e20 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
index 882f335..79f6555 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
@@ -3,39 +3,9 @@
Bundle-Name: EMF To Web
Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web;singleton:=true
Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.emf2web.Activator
Bundle-Vendor: Eclipse Modeling Project
-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;bundle-version="[2.6.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.xtend.lib;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.xtext.xbase.lib;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.7.0,2.0.0)",
- com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.7.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.eclipse.emf.ecp.emf2web;version="1.0.0";x-internal:=true,
org.eclipse.emf.ecp.emf2web.controller;version="1.0.0";
uses:="org.eclipse.emf.ecore,
@@ -46,4 +16,33 @@
org.eclipse.emf.ecp.emf2web.generator;version="1.0.0";uses:="org.eclipse.emf.ecore",
org.eclipse.emf.ecp.emf2web.internal.messages;version="1.0.0";x-internal:=true,
org.eclipse.emf.ecp.emf2web.util;version="1.0.0";uses:="org.eclipse.emf.ecore"
-
+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;bundle-version="[2.6.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.xtend.lib;bundle-version="[2.8.0,3.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.8.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.11.0,3.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.10.0,2.0.0)",
+ com.google.gson;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
index 27e8dec..e64c59d 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web/src/org/eclipse/emf/ecp/emf2web/util/AbstractReferenceHelper.java b/bundles/org.eclipse.emf.ecp.emf2web/src/org/eclipse/emf/ecp/emf2web/util/AbstractReferenceHelper.java
index 21a9f1b..48156cf 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/src/org/eclipse/emf/ecp/emf2web/util/AbstractReferenceHelper.java
+++ b/bundles/org.eclipse.emf.ecp.emf2web/src/org/eclipse/emf/ecp/emf2web/util/AbstractReferenceHelper.java
@@ -112,7 +112,7 @@
final String firstPath = path.split("/")[1]; //$NON-NLS-1$
final String editPath = firstPath + ".edit/plugin.properties"; //$NON-NLS-1$
final IResource member = ResourcesPlugin.getWorkspace().getRoot().findMember(editPath);
- if (member.exists()) {
+ if (member != null && member.exists()) {
final File file = member.getLocation().toFile();
final Properties p = new Properties();
FileInputStream fis = null;
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 accc10a..640ba85 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,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore Core RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core.rap
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.core.rap;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.rap.rwt;version="0.0.0",
org.eclipse.rap.rwt.service;version="0.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
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 aa063e7..38c1255 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 6e7a128..84e7d85 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";
+Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.10.0";
x-friends:="org.eclipse.emf.ecp.emfstore.ui,
org.eclipse.emf.ecp.emfstore.ui.search,
org.eclipse.emf.ecp.view.ui.editor.test,
@@ -13,7 +13,7 @@
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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
index 818f064..9d5bca9 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 6ef6d0c..2de2990 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.9.0";x-internal:=true;uses:="org.eclipse.core.commands"
-Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui.decorator;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.10.0";x-internal:=true;uses:="org.eclipse.core.commands"
+Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e3/pom.xml
index 14ca728..81f3efe 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 df75bd8..57bf819 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Emfstore e4 ui
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.e4;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.e4.emfstore.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.e4.core.di;bundle-version="[1.2.0,2.0.0)",
javax.inject;bundle-version="[1.0.0,2.0.0)",
org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
org.eclipse.emf.emfstore.client.ui;bundle-version="[1.3.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.100.0,4.0.0)",
org.eclipse.e4.ui.services;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.e4/pom.xml
index eaf41f2..c335e88 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 052033a..6d66f54 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.e3;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/pom.xml
index 52e72ee..82d4b92 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 25ea23b..b5f0a94 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.9.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.10.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.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.jface.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
index 525efd6..004a30f 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 60d4d43..8f2a589 100644
--- a/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.examplemodel.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml b/bundles/org.eclipse.emf.ecp.examplemodel.ui/pom.xml
index c48c2f5..bda46e9 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 2c4863b..04cc8e7 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Explorer Editor Bridge
Bundle-SymbolicName: org.eclipse.emf.ecp.explorereditorbridge;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.ui.view.test"
+Export-Package: org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.editor.e3;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.editor.e3;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.internal.swt;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.internal.swt;version="[1.10.0,2.0.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 20ca97d..20cb413 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
index 54d0b9b..02b52cb 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
index 0765f20..ba2ef07 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,13 +2,14 @@
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.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.9.0";x-internal:=true
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/pom.xml
index e2c5eb0..5f4a859 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 ce49cfe..bb37289 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: IDE View Editor
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.view;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
- org.eclipse.emf.ecp.ide.editor.view.messages;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
+ org.eclipse.emf.ecp.ide.editor.view.messages;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.ui.ide;bundle-version="[3.9.1,4.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.view/pom.xml
index f242181..8fccd63 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 ad0d6db..0af7f69 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Viewmodel
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.editor.viewmodel;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml b/bundles/org.eclipse.emf.ecp.ide.editor.viewmodel/pom.xml
index bf81b26..f297a32 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0dabee5..ce87f1d 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,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Ecore Helper Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.ide.util.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ide.util;version="1.9.0";
+Export-Package: org.eclipse.emf.ecp.ide.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.ide.util;version="1.10.0";
x-friends:="org.eclipse.emf.ecp.ecore.ui,
org.eclipse.emf.ecp.ide.editor.view,
org.eclipse.emf.ecp.ide.view.service,
@@ -15,8 +15,8 @@
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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ide.util/pom.xml b/bundles/org.eclipse.emf.ecp.ide.util/pom.xml
index a72f24b..61e3eee 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 64eeaa8..2955392 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ide.view.service;version="1.9.0";
+Export-Package: org.eclipse.emf.ecp.ide.view.internal.service;version="1.10.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ide.view.service;version="1.10.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.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/ideviewmdoelregistry.xml
diff --git a/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml b/bundles/org.eclipse.emf.ecp.ide.view.service/pom.xml
index 2974a02..e6a6b63 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 84d2e0d..cab702e 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.9.0";x-friends:="org.eclipse.emf.ecp.application.e4"
+Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.10.0";x-friends:="org.eclipse.emf.ecp.application.e4"
Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="[1.1.0,2.0.0)",
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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.quickfix;bundle-version="[1.10.0,2.0.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 b67dc23..50ddf1f 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 f0ecfed..b49803d 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix;version="1.9.0",
- org.eclipse.emf.ecp.quickfix.internal;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.quickfix;version="1.10.0",
+ org.eclipse.emf.ecp.quickfix.internal;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.quickfix/pom.xml b/bundles/org.eclipse.emf.ecp.quickfix/pom.xml
index a632818..2f79ab6 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0bc7d99..4c2dd4f 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.dialogs;version="0.0.0",
org.eclipse.jface.window;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.rap.util/pom.xml b/bundles/org.eclipse.emf.ecp.rap.util/pom.xml
index 0448f4e..dd64fff 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 e063d35..c33b295 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.rap.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.rap;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.rap.ui;bundle-version="2.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.rap/pom.xml b/bundles/org.eclipse.emf.ecp.rap/pom.xml
index 28bce02..12b4ac9 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 3595d13..cabb02a 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.test.common;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.test.common;version="1.10.0"
Require-Bundle: org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.test.common/pom.xml b/bundles/org.eclipse.emf.ecp.test.common/pom.xml
index 4fbc9e1..4dc2790 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0afccf4..4b2e97a 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.commands;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e3;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.linkedView;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.perspective;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.platform;version="1.9.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
- org.eclipse.emf.ecp.ui.tester;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.views;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.actions;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.commands;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e3;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.linkedView;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.perspective;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.platform;version="1.10.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.ecp.ui.tester;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.views;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)"
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
org.eclipse.jface.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
index a18a5f0..436649a 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/linkedView/ILinkedWithEditorView.java b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/linkedView/ILinkedWithEditorView.java
index e9fa06d..8fe18ab 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/linkedView/ILinkedWithEditorView.java
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/linkedView/ILinkedWithEditorView.java
@@ -15,14 +15,25 @@
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewSite;
+/**
+ * A View, which can be linked to an editor.
+ *
+ * @author jonas
+ *
+ */
public interface ILinkedWithEditorView {
/**
* Called to tell the view, that a certain {@link IEditorPart} has been activated.
- *
+ *
* @param activatedEditor The activated {@link IEditorPart}
*/
void editorActivated(IEditorPart activatedEditor);
+ /**
+ * @deprecated Use ViewPart#getViewSite instead
+ * @return the {@link IViewSite} of the linked part
+ */
+ @Deprecated
IViewSite getViewSite();
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java
index a3a19ef..f351783 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/views/ModelExplorerView.java
@@ -168,20 +168,7 @@
});
- final IConfigurationElement[] modelExplorerSettings = Platform.getExtensionRegistry()
- .getConfigurationElementsFor("org.eclipse.emf.ecp.ui.modelExplorerSettings"); //$NON-NLS-1$
- if (modelExplorerSettings.length == 1) {
- if (modelExplorerSettings[0].getAttribute(VIEW_SORTER) != null) {
- try {
- final ViewerSorter sorter = (ViewerSorter) modelExplorerSettings[0]
- .createExecutableExtension(VIEW_SORTER);
- viewer.setSorter(sorter);
- } catch (final CoreException e) {
- Activator.log(e);
- }
-
- }
- }
+ addViewerSorter(viewer);
getSite().getWorkbenchWindow().getWorkbench().addWorkbenchListener(new IWorkbenchListener() {
@@ -201,6 +188,24 @@
return viewer;
}
+ @SuppressWarnings("deprecation")
+ private void addViewerSorter(TreeViewer viewer) {
+ final IConfigurationElement[] modelExplorerSettings = Platform.getExtensionRegistry()
+ .getConfigurationElementsFor("org.eclipse.emf.ecp.ui.modelExplorerSettings"); //$NON-NLS-1$
+ if (modelExplorerSettings.length == 1) {
+ if (modelExplorerSettings[0].getAttribute(VIEW_SORTER) != null) {
+ try {
+ final ViewerSorter sorter = (ViewerSorter) modelExplorerSettings[0]
+ .createExecutableExtension(VIEW_SORTER);
+ viewer.setSorter(sorter);
+ } catch (final CoreException e) {
+ Activator.log(e);
+ }
+
+ }
+ }
+ }
+
@Override
protected void fillLocalToolBar(IToolBarManager manager) {
if (getDialogSettings().getBoolean(LINK_WITH_EDITOR_SET)) {
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 e422902..33645fc 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP E4 UI
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e4;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.handlers;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e4.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.view;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.internal.e4;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.e4.editor;version="1.10.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.handlers;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e4.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.view;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.internal.e4;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.2.0,2.0.0)",
org.eclipse.e4.ui.workbench;bundle-version="[0.10.0,2.0.0)",
org.eclipse.e4.ui.model.workbench;bundle-version="[0.10.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.services;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.annotation;version="1.1.0",
javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.osgi.service.event;version="1.3.0"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
index 51c7311..614c93c 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e4/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.rap/META-INF/MANIFEST.MF
index aa5c7cc..2f18b96 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.10.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.osgi.service.component.annotations;version="[1.0.0,2.0.0)"
Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rap/pom.xml
index 4965649..b08b9c1 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.rcp/META-INF/MANIFEST.MF
index ed33d9f..2820b9d 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.10.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.osgi.service.component.annotations;version="[1.0.0,2.0.0)"
Service-Component: OSGI-INF/org.eclipse.emf.ecp.internal.ui.util.ECPFileDialogHelperImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
index fda7ef0..dc8dc96 100644
--- a/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.rcp/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.transaction/META-INF/MANIFEST.MF
index a305a23..04c39d4 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.action;version="0.0.0",
@@ -33,3 +33,4 @@
org.eclipse.ui.part;ui.workbench=split;version="0.0.0",
org.eclipse.ui.plugin;version="0.0.0",
org.eclipse.ui.views.properties;ui.views=split;version="0.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml b/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
index d027474..426f504 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 bbd83d2..accbad7 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.validation.e4.view;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.validation.e4.view;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.e4.ui.services;bundle-version="[0.1.0,2.0.0)",
org.eclipse.e4.ui.model.workbench;bundle-version="[1.0.1,2.0.0)",
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 d69da0c..987dd68 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.validation/META-INF/MANIFEST.MF
index 2c9fb77..20a21e3 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4",
- org.eclipse.emf.ecp.ui.validation;version="1.9.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
+Export-Package: org.eclipse.emf.ecp.internal.ui.validation;version="1.10.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4",
+ org.eclipse.emf.ecp.ui.validation;version="1.10.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.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/component.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml b/bundles/org.eclipse.emf.ecp.ui.validation/pom.xml
index e263a5f..3585045 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.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 176adfe..bff7dfd 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,48 +2,41 @@
Bundle-ManifestVersion: 2
Bundle-Name: Controls
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer,org.eclipse.emf.ecp.view.model.editor,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
- org.eclipse.emf.ecp.view.spi.editor.controls;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.editor.controls;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer,org.eclipse.emf.ecp.view.model.editor,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.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.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/ControlRootEClassControl2SWTRendererService.xml,
- OSGI-INF/ControlRootEClassControlChangeableSWTRendererService.xml,
- OSGI-INF/DomainModelReferenceControlSWTRendererService.xml,
- OSGI-INF/LeafConditionControlRendererService.xml,
- OSGI-INF/LinkFeatureControlRendererService.xml,
- OSGI-INF/StackItemControlRendererService.xml,
- OSGI-INF/TableColumnsDMRTableControlService.xml,
- OSGI-INF/TableDetailViewControlSWTRendererService.xml
+Service-Component: OSGI-INF/ControlRootEClassControl2SWTRendererService.xml,OSGI-INF/ControlRootEClassControlChangeableSWTRendererService.xml,OSGI-INF/DomainModelReferenceControlSWTRendererService.xml,OSGI-INF/LeafConditionControlRendererService.xml,OSGI-INF/LinkFeatureControlRendererService.xml,OSGI-INF/StackItemControlRendererService.xml,OSGI-INF/TableColumnsDMRTableControlService.xml,OSGI-INF/TableDetailViewControlSWTRendererService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 3dfc6fd..f694682 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRendererService.java
index a8c4e4a..0108204 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControl2SWTRendererService.java
@@ -44,7 +44,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -54,7 +54,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControlChangeableSWTRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControlChangeableSWTRendererService.java
index c252170..129a8a1 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControlChangeableSWTRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/ControlRootEClassControlChangeableSWTRendererService.java
@@ -29,7 +29,7 @@
/**
* DI renderer service for {@link ControlRootEClassControlChangeableSWTRenderer}.
- *
+ *
* @author Lucas Koehler
*
*/
@@ -44,7 +44,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -54,7 +54,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRendererService.java
index ecfa32d..f85fde2 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/DomainModelReferenceControlSWTRendererService.java
@@ -46,7 +46,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -56,7 +56,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LeafConditionControlRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LeafConditionControlRendererService.java
index 426ea67..4f4c7d0 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LeafConditionControlRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LeafConditionControlRendererService.java
@@ -44,7 +44,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -54,7 +54,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRenderer.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRenderer.java
index 1baec56..6d72307 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRenderer.java
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -93,7 +94,7 @@
FilteredReferenceCommand(final Notifier notifier, ComposedAdapterFactory composedAdapterFactory,
Shell shell) {
- super(notifier, composedAdapterFactory, shell, Helper.getRootEClass((EObject) notifier),
+ super(notifier, composedAdapterFactory, shell, getRootEClass(notifier),
new ECPSelectionStatusValidator() {
@Override
@@ -134,4 +135,14 @@
}
+ /**
+ * Allows to retrieve the root eclass necessary to select the {@link VFeaturePathDomainModelReference}.
+ *
+ * @param notifier The {@link Notifier} triggering the selection
+ * @return The {@link EClass} that should be used as root
+ */
+ protected EClass getRootEClass(Notifier notifier) {
+ return Helper.getRootEClass((EObject) notifier);
+ }
+
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRendererService.java
index 65725a4..0093355 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/LinkFeatureControlRendererService.java
@@ -43,7 +43,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -53,7 +53,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/StackItemControlRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/StackItemControlRendererService.java
index 3410f32..2653d83 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/StackItemControlRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/StackItemControlRendererService.java
@@ -44,7 +44,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -54,7 +54,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControlService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControlService.java
index bc24fa9..b85ee77 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControlService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableColumnsDMRTableControlService.java
@@ -43,7 +43,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -53,7 +53,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRendererService.java b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRendererService.java
index 04f8124..a95ee57 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/src/org/eclipse/emf/ecp/view/internal/editor/controls/TableDetailViewControlSWTRendererService.java
@@ -43,7 +43,7 @@
*
* @param databindingService The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -53,7 +53,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
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 d345df2..5800cfa 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,8 +2,9 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/pom.xml
index f9960be..75db89b 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 267f26d..1dffcc0 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
@@ -2,28 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dependency Injection SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.di;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.swt.graphics;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="1.8.0"
+Bundle-ActivationPolicy: lazy
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 a43dac9..dc3a9a5 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 b6c644d..2afd11c 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0",
- org.eclipse.emf.ecp.view.internal.swt;version="1.9.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.9.0",
- org.eclipse.emf.ecp.view.spi.swt.layout;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt;version="1.10.0",
+ org.eclipse.emf.ecp.view.internal.swt;version="1.10.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.10.0",
+ org.eclipse.emf.ecp.view.spi.swt.layout;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/org.eclipse.emf.ecp.ui.view.swt.DefaultReferenceServiceFactory.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.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 61864dc..ac96a48 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.ecp.ui.view/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui.view/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
index 24ef51e..842e4f2 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: MPI UI View
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0",
- org.eclipse.emf.ecp.view.internal.provider;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.internal.ui;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
- org.eclipse.emf.ecp.view.spi.provider;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.renderer;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.ui.view;version="1.10.0",
+ org.eclipse.emf.ecp.view.internal.provider;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.internal.ui;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.spi.provider;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.renderer;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/EMFFormsViewService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view/pom.xml
index 909daa5..10e7818 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view/src/org/eclipse/emf/ecp/view/internal/provider/ViewProviderImpl.java b/bundles/org.eclipse.emf.ecp.ui.view/src/org/eclipse/emf/ecp/view/internal/provider/ViewProviderImpl.java
index c418039..6848215 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view/src/org/eclipse/emf/ecp/view/internal/provider/ViewProviderImpl.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view/src/org/eclipse/emf/ecp/view/internal/provider/ViewProviderImpl.java
@@ -174,7 +174,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY, policy = ReferencePolicy.STATIC)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, policy = ReferencePolicy.STATIC, unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
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 c0a0880..66cb90a 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";
+Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.dialogs;version="1.9.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.internal.ui.model;version="1.9.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.9.0",
- org.eclipse.emf.ecp.internal.ui.util;version="1.9.0";
+ org.eclipse.emf.ecp.internal.ui.composites;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.ui.dialogs;version="1.10.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.internal.ui.model;version="1.10.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.10.0",
+ org.eclipse.emf.ecp.internal.ui.util;version="1.10.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.9.0";
+ org.eclipse.emf.ecp.internal.wizards;version="1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.spi.ui;version="1.9.0",
- org.eclipse.emf.ecp.spi.ui.util;version="1.9.0",
- org.eclipse.emf.ecp.ui;version="1.9.0",
- org.eclipse.emf.ecp.ui.common;version="1.9.0";
+ org.eclipse.emf.ecp.internal.wizards.page;version="1.10.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.spi.ui;version="1.10.0",
+ org.eclipse.emf.ecp.spi.ui.util;version="1.10.0",
+ org.eclipse.emf.ecp.ui;version="1.10.0",
+ org.eclipse.emf.ecp.ui.common;version="1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ui.util;version="1.9.0"
+ org.eclipse.emf.ecp.ui.common.dnd;version="1.10.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ui.util;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui/pom.xml b/bundles/org.eclipse.emf.ecp.ui/pom.xml
index a72ef23..ac38bf5 100644
--- a/bundles/org.eclipse.emf.ecp.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.ui/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
index 35bcaf9..672524b 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.connector;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.validation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml b/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
index df214f8..068ae8b 100644
--- a/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 0f4e804..832ce7b 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.api;version="1.9.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
+Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.api;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/validationService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.validation/pom.xml b/bundles/org.eclipse.emf.ecp.validation/pom.xml
index 58a60e7..97f1eb0 100644
--- a/bundles/org.eclipse.emf.ecp.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.validation/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
index 5fcea4a..1028e84 100644
--- a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
@@ -2,10 +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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.viewers;version="0.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/pom.xml
index 342f5c5..ce826e4 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 fae77f2..3b31bec 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.model.edit/pom.xml
index cc1ca4e..d8c2fd0 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 f44e1f9..b64b42c 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
index 49926b7..51ef154 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.model/model/categorization.ecore
@@ -31,7 +31,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CategorizableElement" abstract="true"
eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Element">
- <eStructuralFeatures xsi:type="ecore:EReference" name="labelObject" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
+ <eStructuralFeatures xsi:type="ecore:EReference" name="labelObject" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.model/pom.xml
index 7bfa3d6..a077eda 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 f49949e..3c55aad 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.categorization.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/categorizationElementTabbedRendererService.xml,OSGI-INF/compositeCategoryTreeRendererService.xml,OSGI-INF/compositeCategoryTabRendererService.xml,OSGI-INF/swtCategorizationElementRendererService.xml,OSGI-INF/swtCategorizationRendererService.xml,OSGI-INF/swtCategoryRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.categorization.swt/pom.xml
index 6ecbb61..0101306 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/internal/categorization/swt/Activator.java b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/internal/categorization/swt/Activator.java
index a8e788b..c178751 100644
--- a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/internal/categorization/swt/Activator.java
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/internal/categorization/swt/Activator.java
@@ -11,9 +11,15 @@
******************************************************************************/
package org.eclipse.emf.ecp.view.internal.categorization.swt;
+import java.net.URL;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
import org.osgi.framework.BundleContext;
/**
@@ -27,6 +33,27 @@
/** The shared instance. */
private static Activator plugin;
+ @SuppressWarnings("restriction")
+ private final Map<String, org.eclipse.emf.ecp.edit.internal.swt.ImageDescriptorToImage> imageRegistry = new LinkedHashMap<String, org.eclipse.emf.ecp.edit.internal.swt.ImageDescriptorToImage>(
+ 20, .8F, true) {
+ private static final long serialVersionUID = 1L;
+
+ // This method is called just after a new entry has been added
+ @Override
+ public boolean removeEldestEntry(
+ Map.Entry<String, org.eclipse.emf.ecp.edit.internal.swt.ImageDescriptorToImage> eldest) {
+ return size() > 20;
+ }
+
+ @Override
+ public org.eclipse.emf.ecp.edit.internal.swt.ImageDescriptorToImage remove(Object arg0) {
+ final org.eclipse.emf.ecp.edit.internal.swt.ImageDescriptorToImage image = super.remove(arg0);
+ image.getImage().dispose();
+ return image;
+ }
+
+ };
+
/**
* The constructor.
*/
@@ -71,4 +98,23 @@
plugin.getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, throwable.getMessage(), throwable));
}
+ /**
+ * Loads an image based on the provided {@link URL} form this bundle. The url may be null, then an empty image is
+ * returned.
+ *
+ * @param url the {@link URL} to load the {@link Image} from
+ * @return the {@link Image}
+ */
+ @SuppressWarnings("restriction")
+ public static Image getImage(URL url) {
+ if (!getDefault().imageRegistry.containsKey(url == null ? "NULL" : url.toExternalForm())) { //$NON-NLS-1$
+
+ final ImageDescriptor createFromURL = ImageDescriptor.createFromURL(url);
+ getDefault().imageRegistry.put(url == null ? "NULL" : url.toExternalForm(), //$NON-NLS-1$
+ new org.eclipse.emf.ecp.edit.internal.swt.ImageDescriptorToImage(createFromURL));
+ }
+ return getDefault().imageRegistry.get(url == null ? "NULL" : url.toExternalForm()).getImage(); //$NON-NLS-1$
+
+ }
+
}
diff --git a/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/internal/categorization/swt/ValidationTabImageHelper.java b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/internal/categorization/swt/ValidationTabImageHelper.java
new file mode 100644
index 0000000..c3e55c2
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.categorization.swt/src/org/eclipse/emf/ecp/view/internal/categorization/swt/ValidationTabImageHelper.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.categorization.swt;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Helper class for creating an image for a {@link VTTabStyleProperty} validation URL.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public final class ValidationTabImageHelper {
+
+ private ValidationTabImageHelper() {
+ /* util */
+ }
+
+ /**
+ * @param tabStyle the tab style to use
+ * @param severity the severity of the diagnostic
+ * @return the validation icon or <code>null</code>
+ */
+ public static Image getValidationIcon(Optional<VTTabStyleProperty> tabStyle, int severity) {
+ if (!tabStyle.isPresent()) {
+ return null;
+ }
+ String imageUrl = null;
+ switch (severity) {
+ case Diagnostic.OK:
+ imageUrl = tabStyle.get().getOkImageURL();
+ break;
+ case Diagnostic.INFO:
+ imageUrl = tabStyle.get().getInfoImageURL();
+ break;
+ case Diagnostic.WARNING:
+ imageUrl = tabStyle.get().getWarningImageURL();
+ break;
+ case Diagnostic.ERROR:
+ imageUrl = tabStyle.get().getErrorImageURL();
+ break;
+ case Diagnostic.CANCEL:
+ imageUrl = tabStyle.get().getCancelImageURL();
+ break;
+ default:
+ throw new IllegalArgumentException(
+ "The specified severity value " + severity + " is invalid. See Diagnostic class."); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ if (imageUrl == null) {
+ return null;
+ }
+ try {
+ return Activator.getImage(new URL(imageUrl));
+ } catch (final MalformedURLException ex) {
+ return null;
+ }
+ }
+}
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 1d30280..8819700 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
@@ -22,8 +22,10 @@
import org.eclipse.emf.databinding.EMFDataBindingContext;
import org.eclipse.emf.databinding.edit.EMFEditObservables;
import org.eclipse.emf.ecp.view.internal.categorization.swt.Activator;
+import org.eclipse.emf.ecp.view.internal.categorization.swt.ValidationTabImageHelper;
import org.eclipse.emf.ecp.view.spi.categorization.model.VAbstractCategorization;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VDiagnostic;
import org.eclipse.emf.ecp.view.spi.model.VElement;
import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
import org.eclipse.emf.ecp.view.spi.model.reporting.StatusReport;
@@ -33,6 +35,7 @@
import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
import org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.spi.common.report.ReportService;
import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
import org.eclipse.emfforms.spi.swt.core.EMFFormsNoRendererException;
@@ -50,6 +53,7 @@
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
@@ -62,6 +66,7 @@
public abstract class AbstractSWTTabRenderer<VELEMENT extends VElement> extends AbstractSWTRenderer<VELEMENT> {
private final Map<CTabItem, VAbstractCategorization> itemToCategorizationMap = new LinkedHashMap<CTabItem, VAbstractCategorization>();
+ private final Map<VAbstractCategorization, CTabItem> categorizationToItemMap = new LinkedHashMap<VAbstractCategorization, CTabItem>();
private final Map<CTabItem, Composite> itemToCompositeMap = new LinkedHashMap<CTabItem, Composite>();
private final EMFFormsRendererFactory emfFormsRendererFactory;
@@ -134,6 +139,7 @@
}
itemToCategorizationMap.put(item, categorization);
+ categorizationToItemMap.put(categorization, item);
itemToCompositeMap.put(item, composite);
final IObservableValue modelValue = EMFEditObservables.observeValue(
@@ -239,9 +245,9 @@
return false;
}
- private int getTabFolderStyle() {
+ private Optional<VTTabStyleProperty> getTabStyle() {
if (getViewTemplateProvider() == null) {
- return getDefaultFolderStyle();
+ return Optional.empty();
}
final Set<VTStyleProperty> styleProperties = getViewTemplateProvider()
.getStyleProperties(getVElement(), getViewModelContext());
@@ -249,17 +255,25 @@
if (!VTTabStyleProperty.class.isInstance(styleProperty)) {
continue;
}
- final VTTabStyleProperty style = VTTabStyleProperty.class.cast(styleProperty);
- switch (style.getType()) {
- case BOTTOM:
- return SWT.BOTTOM;
- case TOP:
- return SWT.TOP;
- default:
- return getDefaultFolderStyle();
- }
+ return Optional.of(VTTabStyleProperty.class.cast(styleProperty));
}
- return getDefaultFolderStyle();
+ return Optional.empty();
+ }
+
+ private int getTabFolderStyle() {
+ final Optional<VTTabStyleProperty> tabStyle = getTabStyle();
+ if (!tabStyle.isPresent()) {
+ return getDefaultFolderStyle();
+ }
+ final VTTabStyleProperty style = tabStyle.get();
+ switch (style.getType()) {
+ case BOTTOM:
+ return SWT.BOTTOM;
+ case TOP:
+ return SWT.TOP;
+ default:
+ return getDefaultFolderStyle();
+ }
}
private int getDefaultFolderStyle() {
@@ -273,6 +287,21 @@
*/
protected abstract EList<VAbstractCategorization> getCategorizations();
+ @Override
+ protected void applyValidation() {
+ super.applyValidation();
+ for (final VAbstractCategorization categorization : getCategorizations()) {
+ final VDiagnostic diagnostic = categorization.getDiagnostic();
+ Image image = null;
+ if (diagnostic != null) {
+ final int highestSeverity = diagnostic.getHighestSeverity();
+ image = ValidationTabImageHelper.getValidationIcon(getTabStyle(), highestSeverity);
+ }
+ final CTabItem tabItem = categorizationToItemMap.get(categorization);
+ tabItem.setImage(image);
+ }
+ }
+
/**
* {@inheritDoc}
*
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 55d8958..25a628b 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model.edit/pom.xml
index 1886d64..5fa55ae 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 2f20f20..307dc20 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.model/pom.xml
index d3074ea..38afcd6 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
index dae46a1..d5f952a 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: Compound Control SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 b6f9da0..8f5b53f 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 4661498..16ce974 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/pom.xml
index 7350f22..848eaa9 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 7d75648..dc7201b 100644
--- a/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.context.locale/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Locale View Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.locale;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml b/bundles/org.eclipse.emf.ecp.view.context.locale/pom.xml
index eda2869..31c0a8c 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0d13e07..4c69425 100644
--- a/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.context/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Context
Bundle-SymbolicName: org.eclipse.emf.ecp.view.context;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.internal.context.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.context;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.context;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.common;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.context/pom.xml b/bundles/org.eclipse.emf.ecp.view.context/pom.xml
index 26517d1..b87ed2f 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 c71c791..e7ea8a3 100644
--- a/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.control.multireference/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: Multireference
Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.10.0,2.0.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 d62d1e9..e6cf321 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
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 13e9b30..58b793b 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/META-INF/MANIFEST.MF
@@ -2,37 +2,37 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Core SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.9.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.9.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.10.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.10.0";
uses:="org.eclipse.emf.ecp.ui.view.swt.internal,
org.eclipse.emf.ecp.view.spi.model,
org.eclipse.swt.widgets,
org.eclipse.emf.ecp.view.spi.context",
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.9.0"
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/booleanControlService.xml,OSGI-INF/dateTimeControlService.xml,OSGI-INF/enumControlService.xml,OSGI-INF/numberControlService.xml,OSGI-INF/textControlService.xml,OSGI-INF/xmlDateControlService.xml,OSGI-INF/viewRendererService.xml,OSGI-INF/linkControlService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.locale;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 bd51fd3..2b82dd0 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
index 4715dcf..303ee49 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlSWTRenderer.java
@@ -98,7 +98,7 @@
}
return super.doSet(observableValue, value);
}
- };
+ }
private final EMFFormsLocalizationService localizationService;
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
index 3a16555..777850c 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/LinkControlSWTRenderer.java
@@ -57,6 +57,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
+import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
/**
@@ -270,12 +271,16 @@
deleteReferenceButton = new Button(parent, SWT.PUSH);
GridDataFactory.fillDefaults().grab(false, false).align(SWT.CENTER, SWT.CENTER).applyTo(deleteReferenceButton);
deleteReferenceButton
- .setImage(imageRegistryService.getImage(FrameworkUtil.getBundle(getClass()), "icons/unset_reference.png")); //$NON-NLS-1$
+ .setImage(imageRegistryService.getImage(getIconBundle(), "icons/unset_reference.png")); //$NON-NLS-1$
deleteReferenceButton.setToolTipText(getLocalizedString(MessageKeys.LinkControl_DeleteReference));
deleteReferenceButton.addSelectionListener(new DeleteSelectionAdapter());
}
+ private Bundle getIconBundle() {
+ return FrameworkUtil.getBundle(LinkControlSWTRenderer.class);
+ }
+
/**
* Returns the link text to be used for the given linked {@code value}.
*
@@ -311,11 +316,11 @@
}
private Image getNewReferenceButtonImage() {
- return imageRegistryService.getImage(FrameworkUtil.getBundle(getClass()), "icons/set_reference.png"); //$NON-NLS-1$
+ return imageRegistryService.getImage(getIconBundle(), "icons/set_reference.png"); //$NON-NLS-1$
}
private Image getAddReferenceButtonImage() {
- return imageRegistryService.getImage(FrameworkUtil.getBundle(getClass()), "icons/reference.png"); //$NON-NLS-1$
+ return imageRegistryService.getImage(getIconBundle(), "icons/reference.png"); //$NON-NLS-1$
}
private void createHyperlink() throws DatabindingFailedException {
@@ -368,7 +373,7 @@
}
private String getLocalizedString(String key) {
- return localizationService.getString(getClass(), key);
+ return localizationService.getString(LinkControlSWTRenderer.class, key);
}
/**
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
index afa712d..617b304 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlSWTRenderer.java
@@ -406,6 +406,11 @@
}
@Override
+ protected void setValidationForegroundColor(Control control, Color validationColor) {
+ super.setValidationForegroundColor(Composite.class.cast(control).getChildren()[0], validationColor);
+ }
+
+ @Override
protected void setControlEnabled(SWTGridCell gridCell, Control control, boolean enabled) {
if (getVElement().getLabelAlignment() == LabelAlignment.NONE && gridCell.getColumn() == 1
|| hasLeftLabelAlignment() && gridCell.getColumn() == 2) {
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 5510a12..914cc29 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
@@ -197,7 +197,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
*/
@@ -282,6 +282,21 @@
}
/**
+ * 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
+ */
+ protected final Color getValidationForegroundColor(int severity) {
+ if (isDisposed) {
+ return null;
+ }
+ return SWTValidationHelper.INSTANCE
+ .getValidationForegroundColor(severity, getVElement(), getViewModelContext());
+ }
+
+ /**
* Creates a new {@link DataBindingContext}.
*
* @return a new {@link DataBindingContext} each time this method is called
@@ -333,7 +348,7 @@
* @param parent the {@link Composite} to render onto
* @return the created {@link Control} or null
*/
- protected final Control createLabel(final Composite parent) {
+ protected Control createLabel(final Composite parent) {
Label label = null;
labelRender: if (hasLeftLabelAlignment()) {
final VDomainModelReference domainModelReference = getVElement().getDomainModelReference();
@@ -430,7 +445,7 @@
* @param composite the {@link Composite} to create onto
* @return the created Label
*/
- protected final Label createValidationIcon(Composite composite) {
+ protected Label createValidationIcon(Composite composite) {
final Label validationLabel = new Label(composite, SWT.NONE);
SWTDataElementIdHelper.setElementIdDataWithSubId(validationLabel, getVElement(), "control_validation", //$NON-NLS-1$
getViewModelContext());
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java
index 33c2b03..d235637 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/SimpleControlSWTControlSWTRenderer.java
@@ -89,6 +89,7 @@
protected void rootDomainModelChanged() throws DatabindingFailedException {
disposeBindings();
bindings = createBindings(control);
+ super.rootDomainModelChanged();
}
/**
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 82be9cc..b46092a 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
@@ -93,22 +93,46 @@
@Override
public void notifyChange(ModelChangeNotification notification) {
+ updateTopControl();
+ }
+
+ void updateTopControl() {
if (eObject.eIsSet(structuralFeature)) {
- if (sl.topControl == baseControl) {
+ if (getStack().topControl == getBaseControl()) {
return;
}
- sl.topControl = baseControl;
- unsetButton.setImage(Activator.getImage(ICONS_UNSET_FEATURE));
- controlComposite.layout(true);
+ getStack().topControl = getBaseControl();
+ getUnsetButton().setImage(Activator.getImage(ICONS_UNSET_FEATURE));
+ getControlComposite().layout(true);
} else {
- if (sl.topControl == createUnsetLabel) {
+ if (getStack().topControl == getUnsetLabel()) {
return;
}
- sl.topControl = createUnsetLabel;
- unsetButton.setImage(Activator.getImage(ICONS_SET_FEATURE));
- controlComposite.layout(true);
+ getStack().topControl = getUnsetLabel();
+ getUnsetButton().setImage(Activator.getImage(ICONS_SET_FEATURE));
+ getControlComposite().layout(true);
}
}
+
+ Composite getControlComposite() {
+ return controlComposite;
+ }
+
+ StackLayout getStack() {
+ return sl;
+ }
+
+ Control getBaseControl() {
+ return baseControl;
+ }
+
+ Control getUnsetLabel() {
+ return createUnsetLabel;
+ }
+
+ Button getUnsetButton() {
+ return unsetButton;
+ }
}
/**
@@ -201,6 +225,9 @@
private SWTGridDescription rendererGridDescription;
private UnsetModelChangeListener unsetModelChangeListener;
+ private Label validationIcon;
+ private Control editControl;
+
/**
* {@inheritDoc}
*
@@ -323,21 +350,11 @@
case 0:
return createLabel(parent);
case 1:
- return createValidationIcon(parent);
+ validationIcon = createValidationIcon(parent);
+ return validationIcon;
case 2:
- try {
- if (isUnsettable()) {
- return createUnsettableControl(parent);
- }
- final Control control = createControl(parent);
- setControlIdData(control);
- return control;
- } catch (final DatabindingFailedException ex) {
- getReportService().report(new RenderingFailedReport(ex));
- final Label errorLabel = new Label(parent, SWT.NONE);
- errorLabel.setText(ex.getMessage());
- return errorLabel;
- }
+ editControl = createEditControl(parent);
+ return editControl;
default:
throw new IllegalArgumentException(
String
@@ -347,6 +364,22 @@
}
}
+ private Control createEditControl(Composite parent) {
+ try {
+ if (isUnsettable()) {
+ return createUnsettableControl(parent);
+ }
+ final Control control = createControl(parent);
+ setControlIdData(control);
+ return control;
+ } catch (final DatabindingFailedException ex) {
+ getReportService().report(new RenderingFailedReport(ex));
+ final Label errorLabel = new Label(parent, SWT.NONE);
+ errorLabel.setText(ex.getMessage());
+ return errorLabel;
+ }
+ }
+
/**
* Returns true if the control is unsettable.
*
@@ -378,6 +411,14 @@
unsetButton.addSelectionListener(
new UnsetSelectionAdapter(sl, unsetButton, createUnsetLabel, baseControl, controlComposite));
+ unsetModelChangeListener = registerUnsetStateListener(controlComposite, sl, baseControl, createUnsetLabel,
+ unsetButton);
+ return composite;
+ }
+
+ private UnsetModelChangeListener registerUnsetStateListener(final Composite controlComposite, final StackLayout sl,
+ final Control baseControl, final Control createUnsetLabel, final Button unsetButton)
+ throws DatabindingFailedException {
final EStructuralFeature structuralFeature = (EStructuralFeature) getModelValue().getValueType();
final EObject eObject = (EObject) ((IObserving) getModelValue()).getObserved();
if (eObject.eIsSet(structuralFeature)) {
@@ -388,10 +429,10 @@
unsetButton.setImage(Activator.getImage(ICONS_SET_FEATURE));
}
/* There is no UNSET databinding trigger available */
- unsetModelChangeListener = new UnsetModelChangeListener(eObject, unsetButton,
+ final UnsetModelChangeListener unsetModelChangeListener = new UnsetModelChangeListener(eObject, unsetButton,
structuralFeature, createUnsetLabel, controlComposite, sl, baseControl);
getViewModelContext().registerDomainChangeListener(unsetModelChangeListener);
- return composite;
+ return unsetModelChangeListener;
}
private Control createUnsetLabel(Composite parent) {
@@ -421,6 +462,17 @@
control.setBackground(validationColor);
}
+ /**
+ * Set the provided validation color as the foreground for the provided control.
+ *
+ * @param control the control to set the color on
+ * @param validationColor the validation color to set
+ * @since 1.10
+ */
+ protected void setValidationForegroundColor(Control control, Color validationColor) {
+ control.setForeground(validationColor);
+ }
+
@Override
protected void setControlEnabled(SWTGridCell gridCell, Control control, boolean enabled) {
int controlIndex = gridCell.getColumn();
@@ -451,23 +503,6 @@
}
private void applyInnerValidation() {
- Label validationIcon;
- Control editControl;
- switch (getControls().size()) {
- case 2:
- validationIcon = Label.class.cast(getControls().get(
- new SWTGridCell(0, 0, SimpleControlSWTRenderer.this)));
- editControl = getControls().get(new SWTGridCell(0, 1, SimpleControlSWTRenderer.this));
- break;
- case 3:
- validationIcon = Label.class.cast(getControls().get(
- new SWTGridCell(0, 1, SimpleControlSWTRenderer.this)));
- editControl = getControls().get(new SWTGridCell(0, 2, SimpleControlSWTRenderer.this));
- break;
- default:
- getReportService().report(new AbstractReport("Wrong number of controls!")); //$NON-NLS-1$
- return;
- }
// triggered due to another validation rule before this control is rendered
if (validationIcon == null || editControl == null) {
return;
@@ -484,6 +519,7 @@
validationIcon.setImage(getValidationIcon(highestSeverity));
setValidationColor(editControl, getValidationBackgroundColor(highestSeverity));
+ setValidationForegroundColor(editControl, getValidationForegroundColor(highestSeverity));
if (getVElement().getDiagnostic() == null) {
validationIcon.setToolTipText(null);
} else {
@@ -526,6 +562,24 @@
getViewModelContext().unregisterDomainChangeListener(unsetModelChangeListener);
unsetModelChangeListener = null;
}
+ validationIcon = null;
+ editControl = null;
super.dispose();
}
+
+ @Override
+ protected void rootDomainModelChanged() throws DatabindingFailedException {
+ if (unsetModelChangeListener == null) {
+ super.rootDomainModelChanged();
+ return;
+ }
+ getViewModelContext().unregisterDomainChangeListener(unsetModelChangeListener);
+ unsetModelChangeListener = registerUnsetStateListener(
+ unsetModelChangeListener.getControlComposite(),
+ unsetModelChangeListener.getStack(),
+ unsetModelChangeListener.getBaseControl(),
+ unsetModelChangeListener.getUnsetLabel(),
+ unsetModelChangeListener.getUnsetButton());
+ super.rootDomainModelChanged();
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
index 20ab2e3..05448d1 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlSWTRenderer.java
@@ -227,7 +227,12 @@
return textStyle;
}
- private EMFFormsEditSupport getEMFFormsEditSupport() {
+ /**
+ *
+ * @return the {@link EMFFormsEditSupport}
+ * @since 1.10
+ */
+ protected EMFFormsEditSupport getEMFFormsEditSupport() {
return emfFormsEditSupport;
}
@@ -451,4 +456,9 @@
protected void setValidationColor(Control control, Color validationColor) {
super.setValidationColor(Composite.class.cast(control).getChildren()[0], validationColor);
}
+
+ @Override
+ protected void setValidationForegroundColor(Control control, Color validationColor) {
+ super.setValidationForegroundColor(Composite.class.cast(control).getChildren()[0], validationColor);
+ }
}
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 6a43fca..804e4c6 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/pom.xml
index 039f46d..7efb8c0 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.ecp.view.custom.model/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
index d2a12de..65828b7 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,34 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0",
- org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/EMFFormsCustomDMRExpander.xml,
- OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRConverter.xml,
- OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRMappingProvider.xml,
- OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.StructuralChangeCustomDMRTester.xml
+Service-Component: OSGI-INF/EMFFormsCustomDMRExpander.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRConverter.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRMappingProvider.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.StructuralChangeCustomDMRTester.xml
Import-Package: org.eclipse.core.databinding.property.list;version="0.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emf.ecp.common.spi;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.spi.asserts;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.common.spi;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.spi.asserts;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.custom.model/pom.xml
index e2ac6a5..30b0ce3 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRConverter.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRConverter.java
index 3c6f9c9..3a95072 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRConverter.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRConverter.java
@@ -48,6 +48,7 @@
public class CustomDMRConverter implements DomainModelReferenceConverterEMF {
private EMFFormsDatabindingEMF emfFormsDatabinding;
private ServiceReference<EMFFormsDatabindingEMF> databindingServiceReference;
+ private BundleContext bundleContext;
/**
* This method is called by the OSGI framework when this {@link DomainModelReferenceConverterEMF} is activated. It
@@ -57,9 +58,7 @@
*/
@Activate
protected final void activate(BundleContext bundleContext) {
- databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
- emfFormsDatabinding = bundleContext.getService(databindingServiceReference);
-
+ this.bundleContext = bundleContext;
}
/**
@@ -70,8 +69,21 @@
*/
@Deactivate
protected final void deactivate(BundleContext bundleContext) {
- bundleContext.ungetService(databindingServiceReference);
- emfFormsDatabinding = null;
+ if (databindingServiceReference != null) {
+ bundleContext.ungetService(databindingServiceReference);
+ emfFormsDatabinding = null;
+ }
+ }
+
+ private EMFFormsDatabindingEMF getEMFFormsDatabindingEMF() {
+ if (emfFormsDatabinding == null) {
+ databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
+ if (databindingServiceReference == null) {
+ throw new IllegalStateException("No EMFFormsDatabindingEMF available!"); //$NON-NLS-1$
+ }
+ emfFormsDatabinding = bundleContext.getService(databindingServiceReference);
+ }
+ return emfFormsDatabinding;
}
/**
@@ -107,7 +119,7 @@
final VCustomDomainModelReference tableDomainModelReference = VCustomDomainModelReference.class
.cast(domainModelReference);
if (!tableDomainModelReference.getDomainModelReferences().isEmpty()) {
- return emfFormsDatabinding
+ return getEMFFormsDatabindingEMF()
.getValueProperty(tableDomainModelReference.getDomainModelReferences().iterator().next(), object);
}
final ECPHardcodedReferences customControl = loadObject(tableDomainModelReference.getBundleName(),
@@ -127,7 +139,7 @@
"The provided ECPHardcodedReferences from Bundle %1$s Class %2$s doesn't define any DomainModelReferences.", //$NON-NLS-1$
tableDomainModelReference.getBundleName(), tableDomainModelReference.getClassName()));
}
- return emfFormsDatabinding.getValueProperty(neededDomainModelReferences.iterator().next(), object);
+ return getEMFFormsDatabindingEMF().getValueProperty(neededDomainModelReferences.iterator().next(), object);
}
private static ECPHardcodedReferences loadObject(String bundleName, String clazz)
@@ -190,7 +202,7 @@
"The provided ECPHardcodedReferences from Bundle %1$s Class %2$s doesn't define any DomainModelReferences.", //$NON-NLS-1$
tableDomainModelReference.getBundleName(), tableDomainModelReference.getClassName()));
}
- return emfFormsDatabinding.getListProperty(neededDomainModelReferences.iterator().next(), object);
+ return getEMFFormsDatabindingEMF().getListProperty(neededDomainModelReferences.iterator().next(), object);
}
/**
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRMappingProvider.java b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRMappingProvider.java
index d2c5a9d..235de87 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRMappingProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/src/org/eclipse/emf/ecp/view/spi/custom/model/impl/CustomDMRMappingProvider.java
@@ -88,7 +88,8 @@
customDomainModelReference.getBundleName(), customDomainModelReference.getClassName()))));
return Collections.<UniqueSetting> emptySet();
}
- final Set<VDomainModelReference> neededDomainModelReferences = hardcodedReference.getNeededDomainModelReferences();
+ final Set<VDomainModelReference> neededDomainModelReferences = hardcodedReference
+ .getNeededDomainModelReferences();
if (neededDomainModelReferences.isEmpty()) {
reportService.report(new DatabindingFailedReport(new DatabindingFailedException(
String
@@ -200,7 +201,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
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 33763f9..15da8f7 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,18 +2,19 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
org.eclipse.e4.core.di;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.10.0,2.0.0)",
org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 231b06a..b321330 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
index 399edda..edd021c 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: Custom View SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
- org.eclipse.emf.ecp.view.spi.custom.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.custom.swt;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
+ org.eclipse.emf.ecp.view.spi.custom.swt;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.10.0,2.0.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 fcfd791..34a69b5 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
index aa87755..1423d14 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,11 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Edapt
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edapt.history;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.edapt/pom.xml
index f9f222f..f1554be 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 63532ee..d3c9e37 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.model.edit/pom.xml
index fc1b8dd..db8118d 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0d06060..2a78c1f 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.group.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.group.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
index e95b9de..fe78f5b 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.group.model/model/group.ecore
@@ -6,7 +6,7 @@
eType="#//GroupType"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="labelAlignment" eType="#//GroupLabelAlignment"
defaultValueLiteral="LabelAligned"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsed" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="GroupType">
<eLiterals name="Normal"/>
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 af06a78..320b8a9 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0f8b641..a293fa1 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsable/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Collapsable Group
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.collapsable
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.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 cf284d5..742d8e6 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 7c836d6..0ad922d 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,19 +2,19 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/pGroupRendererService.xml
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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",
@@ -22,3 +22,4 @@
org.eclipse.swt.layout;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="1.6.0"
+Bundle-ActivationPolicy: lazy
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 33450b0..41c2633 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 1117f1c..aa41f89 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.embedded/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: AlignmentGroup SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.swt.embedded
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.runtime;version="3.4.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 3a468d8..d360eee 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 8cf8f3b..91f28b6 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.ui.swt/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.9.0",
- org.eclipse.emfforms.internal.group.swt;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.10.0",
+ org.eclipse.emfforms.internal.group.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.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 29b15af..f05c9b3 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 270679c..ab8a87f 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model.edit/pom.xml
index ab09f2e..0b4eaa5 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 ee6d91c..d81b0f4 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.groupedgrid.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.model/pom.xml
index 4c4c7cc..261cdbd 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 56659d5..753d959 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,22 +2,22 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.layout;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
- org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional,
- javax.inject;version="1.0.0"
+ org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/GroupedGridSWTRendererService.xml
Bundle-ActivationPolicy: lazy
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 358585e..da13c01 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 f4b7402..4003b35 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.model.edit/pom.xml
index 61a3432..057c3a1 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 9341149..61638fa 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Horizontal View Model
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.horizontal.model/pom.xml
index 888f569..6ec964b 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 535cb5e..dfaca6b 100644
--- a/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.horizontal.ui.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Horizontal UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.internal.core.swt;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.internal.core.swt;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 eac54d3..617d831 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 66155ab..65b4a15 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.model.edit/pom.xml
index bab59c8..d4433ca 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 ac692c8..fabcdc3 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.indexdmr.model/pom.xml
index 4e31f2c..2ff90f4 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 2170a58..2bdece9 100644
--- a/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.indexdmr.tooling/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Index DMR Tooling
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.tooling;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.indexdmr.tooling.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 a053a6b..7fe107a 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 927d95e..2a21542 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model.edit/pom.xml
index 9286970..604e704 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 89c1f54..3c375c2 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.model/pom.xml
index 3960780..62e050b 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 d6d6a06..3b2db69 100644
--- a/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.keyattributedmr.tooling/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.keyattributedmr.tooling.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 a589562..d298ab4 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 207e0fc..c0bdfc7 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.model.edit/pom.xml
index d5fb3f6..0f3f77b 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 b0bbcce..b54e20d 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.label.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.label.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.model/pom.xml
index 67d1442..0543939 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 5f0cbb8..ee526df 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Label Rap
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.rap
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.10.0,2.0.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
Service-Component: OSGI-INF/labelRAPRendererService.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.label.ui.rap/pom.xml
index 0c0e390..3846f2b 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 fca8e8b..7cac977 100644
--- a/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.label.ui.swt/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Label UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.label.ui.swt
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.label.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.label.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.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 e3da585..fb645eb 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 f6bd8eb..1cd43c6 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model.edit/pom.xml
index e2185d3..517a849 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 00cf50e..3ffe91e 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore
index db0022b..ed11e43 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/model/mappingdmr.ecore
@@ -6,7 +6,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
<details key="constraints" value="resolveable"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="mappedClass" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="mappedClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" lowerBound="1"
eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
containment="true"/>
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 8b1f329..4ae5f35 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 d9f0f9c..45084e8 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Tooling
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.tooling;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.mappingdmr.tooling.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.jface.viewers;version="0.0.0",
org.eclipse.jface.window;version="0.0.0",
org.eclipse.jface.wizard;version="0.0.0",
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 22e0803..3bbc254 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 aae068f..ac1ed6d 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.9.0",
- org.eclipse.emf.ecp.spi.view.migrator.string;version="1.9.0",
- org.eclipse.emf.ecp.view.migrator;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.10.0",
+ org.eclipse.emf.ecp.spi.view.migrator.string;version="1.10.0",
+ org.eclipse.emf.ecp.view.migrator;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
index c42587d..25bc0c7 100644
--- a/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.migrator/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
index 2d820b1..2ffb443 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,18 +2,19 @@
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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.common.di.messages;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.util;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.model.common.di.messages;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.util;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.e4.core.di;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.common.di/pom.xml
index 9a2fb68..f7b8015 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0301846..739cd6e 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,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common View Model Classes
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.internal.model.common.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.model.common;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common;version="1.9.0",
- org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.model.common;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common;version="1.10.0",
+ org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.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 8fd8023..226e388 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 c43ab5b..5e8d3b3 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,8 +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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.1.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.edapt/pom.xml
index 90be80e..6bccfb0 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 4e70481..e5eade6 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.model.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.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 8361b66..f3f17db 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 2efe494..e4222d0 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.project.handlers;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.10.0,2.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)",
org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/pom.xml
index a358f06..1872b4a 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0cd6585..911c37d 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.presentation;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer"
+Export-Package: org.eclipse.emf.ecp.view.model.actions;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.presentation;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)",
org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)"
Import-Package: org.eclipse.jface.wizard;version="0.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.editor/pom.xml
index 8429810..e05148f 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 3e62391..accf9a8 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.generator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Generator
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.generator;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.generator/pom.xml
index 8c21d1c..2539d3e 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 b3e4459..5c1a425 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.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.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.emf.ecp.ui.view.swt;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.locale;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.ui.view.swt;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.10.0,2.0.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 0a513db..aee4eef 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 f06019f..4854be3 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.preview;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.9.0,2.0.0)";resolution:=optional,
- org.eclipse.emfforms.editor;bundle-version="[1.9.0,2.0.0)";resolution:=optional
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.10.0,2.0.0)";resolution:=optional,
+ org.eclipse.emfforms.editor;bundle-version="[1.10.0,2.0.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.core.resources;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/pom.xml
index 7e5d50f..006eb17 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 fcafb8d..f302431 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: XMI View Model Provider
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi;version="1.9.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.internal.view.model.provider.xmi;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/pom.xml
index 73dd523..838a4f1 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 85e5ab8..2d62805 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.model.reporting;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.model.internal.reporting;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.model.reporting;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.model.util;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore b/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore
index d16ff80..dcb56df 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.model/model/view.ecore
@@ -3,7 +3,7 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://org/eclipse/emf/ecp/view/model/170" nsPrefix="org.eclipse.emf.ecp.view.model">
<eClassifiers xsi:type="ecore:EClass" name="Diagnostic">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="diagnostics" upperBound="-1"
- eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
transient="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Attachment" abstract="true"/>
@@ -17,34 +17,34 @@
<details key="constraints" value="resolveable"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEFeature" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEReferencePath"
- unique="false" upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
+ unique="false" upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
transient="true" defaultValueLiteral="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
transient="true" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="diagnostic" eType="#//Diagnostic"
transient="true" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="attachments" upperBound="-1"
eType="#//Attachment" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="uuid" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="uuid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
transient="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="View" eSuperTypes="#//Element">
<eStructuralFeatures xsi:type="ecore:EReference" name="rootEClass" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
eType="#//ContainedElement" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ecorePath" lowerBound="1"
- eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="loadingProperties" lowerBound="1"
eType="#//ViewModelProperties" transient="true" containment="true"/>
</eClassifiers>
@@ -56,6 +56,9 @@
<eClassifiers xsi:type="ecore:EClass" name="ContainedContainer" abstract="true"
eSuperTypes="#//ContainedElement #//Container"/>
<eClassifiers xsi:type="ecore:EClass" name="Control" eSuperTypes="#//ContainedElement">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+ <details key="constraints" value="resolveable"/>
+ </eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="labelAlignment" lowerBound="1"
eType="#//LabelAlignment" defaultValueLiteral="Default"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" lowerBound="1"
diff --git a/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore b/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
index c9c5d00..671daa9 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.model/model/viewModel.ecore
@@ -13,13 +13,13 @@
eType="#//VAttachment" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxWidth" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="minHeight" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="minHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxHeight" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDouble"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
unsettable="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="VAttachment" abstract="true" interface="true"/>
@@ -34,16 +34,16 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DomainModelReference">
<eOperations name="resolve"/>
- <eStructuralFeatures xsi:type="ecore:EReference" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
+ <eStructuralFeatures xsi:type="ecore:EReference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="VFeaturePathDomainModelReference" eSuperTypes="#//DomainModelReference">
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEAttribute"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEReferencePath"
- upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
+ upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
</eClassifiers>
<eSubpackages name="separator">
<eClassifiers xsi:type="ecore:EClass" name="VSeparator" eSuperTypes="#//VElement">
@@ -96,14 +96,14 @@
</eSubpackages>
<eSubpackages name="customControl">
<eClassifiers xsi:type="ecore:EClass" name="VCustomControl" eSuperTypes="#//VElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
</eSubpackages>
<eSubpackages name="customComposite">
<eClassifiers xsi:type="ecore:EClass" name="VCustomViewModelElement" eSuperTypes="#//VElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="osgiBundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
</eSubpackages>
<eSubpackages name="columnComposite">
diff --git a/bundles/org.eclipse.emf.ecp.view.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
index e522c9a..bd9c49f 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java
index 947d810..407e300 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/ModelChangeNotification.java
@@ -88,4 +88,25 @@
return Collections.emptySet();
}
}
+
+ /**
+ * Returns the collection of old EObjects.
+ *
+ * @return The collection of removed EObjects, the collection might be empty but never null.
+ * @since 1.10
+ */
+ @SuppressWarnings("unchecked")
+ public Collection<EObject> getOldEObjects() {
+ if (!EReference.class.isInstance(getStructuralFeature())) {
+ return Collections.emptySet();
+ }
+ switch (getRawNotification().getEventType()) {
+ case Notification.REMOVE:
+ return Collections.singleton((EObject) getRawNotification().getOldValue());
+ case Notification.REMOVE_MANY:
+ return (Collection<EObject>) getRawNotification().getOldValue();
+ default:
+ return Collections.emptySet();
+ }
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java
index eb3004b..8d176bf 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VControl.java
@@ -33,7 +33,7 @@
* </ul>
*
* @see org.eclipse.emf.ecp.view.spi.model.VViewPackage#getControl()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='resolveable'"
* @generated
*/
public interface VControl extends VContainedElement {
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java
index 95b7ed8..03e96b8 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/util/ViewValidator.java
@@ -271,12 +271,20 @@
return false;
}
+ // Do not validate feature dmrs witch are contained in another dmr,
+ // as normally a specific logic is applied for them
+ if (VDomainModelReference.class.isInstance(featurePathDomainModelReference.eContainer())
+ && !context.containsKey(ECLASS_KEY)) {
+ return true;
+ }
+
// identify root eclass
final VView parentView = getParentView(featurePathDomainModelReference);
EClass rootEClass = null;
if (context.containsKey(ECLASS_KEY)) {
rootEClass = (EClass) context.get(ECLASS_KEY);
- } else if (parentView != null) {
+ }
+ if (rootEClass == null && parentView != null) {
rootEClass = parentView.getRootEClass();
if (rootEClass == null) {
if (diagnostics != null) {
@@ -430,15 +438,73 @@
* @generated
*/
public boolean validateControl(VControl control, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return validate_EveryDefaultConstraint(control, diagnostics, context);
+ if (!validate_NoCircularContainment(control, diagnostics, context)) {
+ return false;
+ }
+ boolean result = validate_EveryMultiplicityConforms(control, diagnostics, context);
+ if (result || diagnostics != null) {
+ result &= validate_EveryDataValueConforms(control, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryReferenceIsContained(control, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryBidirectionalReferenceIsPaired(control, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryProxyResolves(control, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_UniqueID(control, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryKeyUnique(control, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryMapEntryUnique(control, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validateControl_resolveable(control, diagnostics, context);
+ }
+ return result;
}
/**
+ * Validates the resolveable constraint of '<em>Control</em>'.
* <!-- begin-user-doc -->
*
+ * @param control the {@link VControl} to check
+ * @param diagnostics the diagnostics
+ * @param context the validation context
+ * <!-- end-user-doc -->
+ * @return the validation result
+ *
+ * @generated NOT
+ * @since 1.10
+ */
+ // CHECKSTYLE.OFF: MethodName
+ public boolean validateControl_resolveable(VControl control, DiagnosticChain diagnostics,
+ Map<Object, Object> context) {
+ // CHECKSTYLE.ON: MethodName
+ final VDomainModelReference domainModelReference = control.getDomainModelReference();
+ if (domainModelReference == null) {
+ diagnostics
+ .add(createDiagnostic(Diagnostic.ERROR, 0, "No Domain Model Reference set.", //$NON-NLS-1$
+ control, VViewPackage.eINSTANCE.getControl_DomainModelReference()));
+ return false;
+ }
+ if (domainModelReference instanceof VFeaturePathDomainModelReference) {
+ return validateFeaturePathDomainModelReference_resolveable(
+ (VFeaturePathDomainModelReference) domainModelReference, diagnostics, context);
+ }
+ return validateDomainModelReference(domainModelReference, diagnostics, context);
+ }
+
+ /**
+ * @generated
+ * <!-- begin-user-doc -->
* @since 1.7
* <!-- end-user-doc -->
- * @generated
*/
public boolean validateViewModelLoadingProperties(VViewModelLoadingProperties viewModelLoadingProperties,
DiagnosticChain diagnostics, Map<Object, Object> context) {
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 0af3cb6..eaaf68e 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: Rule Model Edit Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule.model.edit/pom.xml
index 58871df..ce04aea 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 3a06a48..bce1cbc 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: Rule Model Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0",
- org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore b/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore
index 2a269b8..b93e347 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/model/rule.ecore
@@ -4,7 +4,7 @@
<eClassifiers xsi:type="ecore:EClass" name="Condition" abstract="true"/>
<eClassifiers xsi:type="ecore:EClass" name="LeafCondition" eSuperTypes="#//Condition">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="expectedValue" lowerBound="1"
- eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" lowerBound="1"
eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
containment="true"/>
@@ -25,9 +25,9 @@
eType="#//Condition" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ShowRule" eSuperTypes="#//Rule">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="hide" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="hide" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EnableRule" eSuperTypes="#//Rule">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="disable" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="disable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eClassifiers>
</ecore:EPackage>
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 8092a96..6833080 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/src/org/eclipse/emf/ecp/view/spi/rule/model/impl/LeafConditionSettingIterator.java b/bundles/org.eclipse.emf.ecp.view.rule.model/src/org/eclipse/emf/ecp/view/spi/rule/model/impl/LeafConditionSettingIterator.java
index a507df3..7a0771d 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/src/org/eclipse/emf/ecp/view/spi/rule/model/impl/LeafConditionSettingIterator.java
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/src/org/eclipse/emf/ecp/view/spi/rule/model/impl/LeafConditionSettingIterator.java
@@ -88,17 +88,18 @@
expectedStackSize = expectedStackSize + 1;
}
iterators = new Stack<Iterator<Setting>>();
-
- try {
- final Setting setting = getDatabinding().getSetting(condition.getDomainModelReference(), domainModel);
- final Iterator<Setting> iterator = Collections.singleton(setting).iterator();
- iterators.push(iterator);
- } catch (final DatabindingFailedException ex) {
- getReportService().report(new AbstractReport(ex,
- String.format("Could not get the setting iterator for DMR: %s and domain model: %s", //$NON-NLS-1$
- condition.getDomainModelReference(), domainModel)));
+ final VDomainModelReference dmr = condition.getDomainModelReference();
+ if (dmr != null) {
+ try {
+ final Setting setting = getDatabinding().getSetting(dmr, domainModel);
+ final Iterator<Setting> iterator = Collections.singleton(setting).iterator();
+ iterators.push(iterator);
+ } catch (final DatabindingFailedException ex) {
+ getReportService().report(new AbstractReport(ex,
+ String.format("Could not get the setting iterator for DMR: %s and domain model: %s", //$NON-NLS-1$
+ condition.getDomainModelReference(), domainModel)));
+ }
}
-
// TODO: remove after segments are introduced.
// iterators.push(condition.getDomainModelReference().getIterator());
@@ -284,7 +285,7 @@
/**
* Disposes this {@link LeafConditionSettingIterator}.
- *
+ *
* @since 1.9
*/
public void dispose() {
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.rule/.settings/.api_filters
index 083bc8a..580f16a 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.rule/.settings/.api_filters
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.ecp.view.rule" version="2">
<resource path="META-INF/MANIFEST.MF">
+ <filter comment="Changes are internal or spi for (1.10.0)" id="923795461">
+ <message_arguments>
+ <message_argument value="1.10.0"/>
+ <message_argument value="1.9.0"/>
+ </message_arguments>
+ </filter>
<filter comment="This is SPI" id="923795461">
<message_arguments>
<message_argument value="1.5.0"/>
@@ -8,6 +14,14 @@
</message_arguments>
</filter>
</resource>
+ <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.ecp.view.internal.rule.reporting.LeafConditionDMRResolutionFailedReport">
+ <filter comment="Changes are internal or spi for (1.10.0)" id="305324134">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.internal.rule.reporting.LeafConditionDMRResolutionFailedReport"/>
+ <message_argument value="org.eclipse.emf.ecp.view.rule_1.10.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emf/ecp/view/spi/rule/RuleServiceHelper.java" type="org.eclipse.emf.ecp.view.spi.rule.RuleServiceHelper">
<filter comment="This is SPI" id="405901410">
<message_arguments>
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 411636a..be69e42 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,19 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Rule
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.9.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.internal.rule.reporting;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.rule;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.10.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.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)",
+ org.osgi.service.component.annotations;version="1.2.0"
Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml,
+ OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml,
+ OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.AndConditionService.xml,
+ OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.AndConditionService.xml b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.AndConditionService.xml
new file mode 100644
index 0000000..ca0b85a
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.AndConditionService.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emf.ecp.view.internal.rule.AndConditionService">
+ <service>
+ <provide interface="org.eclipse.emf.ecp.view.spi.rule.ConditionService"/>
+ </service>
+ <implementation class="org.eclipse.emf.ecp.view.internal.rule.AndConditionService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl.xml b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl.xml
new file mode 100644
index 0000000..686f409
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl">
+ <service>
+ <provide interface="org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManager"/>
+ </service>
+ <reference bind="addConditionService" cardinality="0..n" interface="org.eclipse.emf.ecp.view.spi.rule.ConditionService" name="ConditionService" policy="dynamic" unbind="removeConditionService"/>
+ <implementation class="org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml
new file mode 100644
index 0000000..7ddca47
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emf.ecp.view.internal.rule.LeafConditionService">
+ <service>
+ <provide interface="org.eclipse.emf.ecp.view.spi.rule.ConditionService"/>
+ </service>
+ <implementation class="org.eclipse.emf.ecp.view.internal.rule.LeafConditionService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml
new file mode 100644
index 0000000..caba455
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emf.ecp.view.internal.rule.OrConditionService">
+ <service>
+ <provide interface="org.eclipse.emf.ecp.view.spi.rule.ConditionService"/>
+ </service>
+ <implementation class="org.eclipse.emf.ecp.view.internal.rule.OrConditionService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/build.properties b/bundles/org.eclipse.emf.ecp.view.rule/build.properties
index b74d378..4a0d0b8 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/build.properties
+++ b/bundles/org.eclipse.emf.ecp.view.rule/build.properties
@@ -1,11 +1,15 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- modeling32.png
-src.includes = about.html
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ modeling32.png,\
+ OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml,\
+ OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml,\
+ OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.AndConditionService.xml,\
+ OSGI-INF/
+src.includes = about.html
+source.. = src/
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
index 064693b..c8522ce 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/AndConditionService.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/AndConditionService.java
new file mode 100644
index 0000000..a9c3e68
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/AndConditionService.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.rule;
+
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.common.spi.UniqueSetting;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.rule.ConditionService;
+import org.eclipse.emf.ecp.view.spi.rule.model.AndCondition;
+import org.eclipse.emf.ecp.view.spi.rule.model.Condition;
+import org.eclipse.emf.ecp.view.spi.rule.model.RulePackage;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+
+/** {@link ConditionService} for conditions of type {@link AndCondition}. */
+@Component
+public class AndConditionService implements ConditionService<AndCondition> {
+
+ private BundleContext bundleContext;
+ private ServiceReference<ConditionServiceManager> conditionServiceManagerReference;
+ private ConditionServiceManager conditionServiceManager;
+
+ @Override
+ public EClass getConditionType() {
+ return RulePackage.eINSTANCE.getAndCondition();
+ }
+
+ @Override
+ public Set<UniqueSetting> getConditionSettings(AndCondition condition, EObject domainModel) {
+ final Set<UniqueSetting> registeredSettings = new LinkedHashSet<UniqueSetting>();
+ final ConditionServiceManager conditionService = getConditionServiceManager();
+ for (final Condition cond : condition.getConditions()) {
+ registeredSettings.addAll(conditionService.getConditionSettings(cond, domainModel));
+ }
+ return registeredSettings;
+ }
+
+ @Override
+ public boolean evaluate(AndCondition condition, EObject domainModel) {
+ if (condition == null) {
+ return false;
+ }
+ return condition.evaluate(domainModel);
+ }
+
+ @Override
+ public boolean evaluateChangedValues(AndCondition condition, EObject domainModel,
+ Map<Setting, Object> possibleNewValues) {
+ if (condition == null) {
+ return false;
+ }
+ return condition.evaluateChangedValues(domainModel, possibleNewValues);
+ }
+
+ @Override
+ public Set<VDomainModelReference> getDomainModelReferences(AndCondition condition) {
+ final Set<VDomainModelReference> references = new HashSet<VDomainModelReference>();
+ final ConditionServiceManager conditionService = getConditionServiceManager();
+ for (final Condition cond : condition.getConditions()) {
+ references.addAll(conditionService.getDomainModelReferences(cond));
+ }
+ return references;
+ }
+
+ /**
+ * Called by the framework when the component gets activated.
+ *
+ * @param bundleContext The {@link BundleContext}
+ */
+ @Activate
+ protected void activate(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ /**
+ * Called by the framework when the component gets deactivated.
+ *
+ * @param bundleContext The {@link BundleContext}
+ */
+ @Deactivate
+ protected void deactivate(BundleContext bundleContext) {
+ if (conditionServiceManagerReference != null) {
+ bundleContext.ungetService(conditionServiceManagerReference);
+ conditionServiceManager = null;
+ }
+ }
+
+ private ConditionServiceManager getConditionServiceManager() {
+ if (conditionServiceManager == null) {
+ conditionServiceManagerReference = bundleContext
+ .getServiceReference(ConditionServiceManager.class);
+ if (conditionServiceManagerReference == null) {
+ throw new IllegalStateException("No ConditionServiceManager available!"); //$NON-NLS-1$
+ }
+ conditionServiceManager = bundleContext.getService(conditionServiceManagerReference);
+ }
+ return conditionServiceManager;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/ConditionServiceManager.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/ConditionServiceManager.java
new file mode 100644
index 0000000..fab47d6
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/ConditionServiceManager.java
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.rule;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.common.spi.UniqueSetting;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.rule.model.Condition;
+
+/**
+ * The ConditionServiceManager is responsible to delegate evaluation calls about conditions to the corresponding
+ * ConditionServices.
+ *
+ * @author Eugen Neufeld
+ *
+ */
+public interface ConditionServiceManager {
+
+ /**
+ * Returns the conditionSetting for a condition and the corresponding domain model.
+ *
+ * @param condition The condition to get the settings for
+ * @param domainModel The domain model this condition applies to
+ * @return The Set of Settings. This set cannot be null.
+ */
+ Set<UniqueSetting> getConditionSettings(Condition condition, EObject domainModel);
+
+ /**
+ * Evaluates the given condition using the provided domain model.
+ *
+ * @param condition The condition to evaluate.
+ * @param domainModel The root domain object of this condition.
+ * @return {@code true}, if the condition matches, {@code false} otherwise
+ */
+ boolean evaluate(Condition condition, EObject domainModel);
+
+ /**
+ * Evaluates whether the given condition using the provided domain model will change if a specific setting will be
+ * set to a specific value.
+ *
+ * @param condition The condition to evaluate.
+ * @param domainModel The root domain object of this condition.
+ * @param possibleNewValues
+ * the new value that should be compared against the expected value of the condition
+ * @return {@code true}, if the condition matches, {@code false} otherwise
+ */
+ boolean evaluateChangedValues(Condition condition, EObject domainModel, Map<Setting, Object> possibleNewValues);
+
+ /**
+ * The Set of DomainModelReferences this condition needs to evaluate.
+ *
+ * @param condition The condition to retrieve the VDomainModelReferences for
+ * @return The Set of DomainModelReferences. The set cannot be null.
+ */
+ Set<VDomainModelReference> getDomainModelReferences(Condition condition);
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/ConditionServiceManagerImpl.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/ConditionServiceManagerImpl.java
new file mode 100644
index 0000000..bc55b93
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/ConditionServiceManagerImpl.java
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.rule;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.common.spi.UniqueSetting;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.rule.ConditionService;
+import org.eclipse.emf.ecp.view.spi.rule.model.Condition;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
+
+/**
+ * The internal component implementation of the ConditionServiceManager.
+ *
+ * @author Eugen Neufeld
+ *
+ */
+@Component
+public class ConditionServiceManagerImpl implements ConditionServiceManager {
+
+ private final Map<EClass, ConditionService<Condition>> conditionServices = new LinkedHashMap<EClass, ConditionService<Condition>>();
+
+ /**
+ * Called by the framework to add a ConditionService.
+ *
+ * @param <T> The type of the added ConditionService
+ * @param conditionService The ConditionService to add
+ */
+ @Reference(cardinality = ReferenceCardinality.MULTIPLE, policy = ReferencePolicy.DYNAMIC, unbind = "removeConditionService")
+ protected <T extends Condition> void addConditionService(ConditionService<Condition> conditionService) {
+ conditionServices.put(conditionService.getConditionType(), conditionService);
+ }
+
+ /**
+ * Called by the framework to remove a ConditionService.
+ *
+ * @param conditionService The ConditionService to remove
+ */
+ protected void removeConditionService(ConditionService<Condition> conditionService) {
+ conditionServices.remove(conditionService.getConditionType());
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManager#getConditionSettings(org.eclipse.emf.ecp.view.spi.rule.model.Condition,
+ * org.eclipse.emf.ecore.EObject)
+ */
+ @Override
+ public Set<UniqueSetting> getConditionSettings(Condition condition, EObject domainModel) {
+ if (condition == null) {
+ return Collections.emptySet();
+ }
+ return conditionServices.get(condition.eClass()).getConditionSettings(condition, domainModel);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManager#evaluate(org.eclipse.emf.ecp.view.spi.rule.model.Condition,
+ * org.eclipse.emf.ecore.EObject)
+ */
+ @Override
+ public boolean evaluate(Condition condition, EObject domainModel) {
+ if (condition == null) {
+ return false;
+ }
+ return conditionServices.get(condition.eClass()).evaluate(condition, domainModel);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManager#evaluateChangedValues(org.eclipse.emf.ecp.view.spi.rule.model.Condition,
+ * org.eclipse.emf.ecore.EObject, java.util.Map)
+ */
+ @Override
+ public boolean evaluateChangedValues(Condition condition, EObject domainModel,
+ Map<Setting, Object> possibleNewValues) {
+ if (condition == null) {
+ return false;
+ }
+ return conditionServices.get(condition.eClass()).evaluateChangedValues(condition, domainModel,
+ possibleNewValues);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManager#getDomainModelReferences(org.eclipse.emf.ecp.view.spi.rule.model.Condition)
+ */
+ @Override
+ public Set<VDomainModelReference> getDomainModelReferences(Condition condition) {
+ if (condition == null) {
+ return Collections.emptySet();
+ }
+ return conditionServices.get(condition.eClass()).getDomainModelReferences(condition);
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/LeafConditionService.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/LeafConditionService.java
new file mode 100644
index 0000000..3eee9e0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/LeafConditionService.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.rule;
+
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.common.spi.UniqueSetting;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.rule.ConditionService;
+import org.eclipse.emf.ecp.view.spi.rule.model.LeafCondition;
+import org.eclipse.emf.ecp.view.spi.rule.model.RulePackage;
+import org.eclipse.emf.ecp.view.spi.rule.model.impl.LeafConditionSettingIterator;
+import org.osgi.service.component.annotations.Component;
+
+/** {@link ConditionService} for conditions of type {@link LeafCondition}. */
+@Component
+public class LeafConditionService implements ConditionService<LeafCondition> {
+
+ @Override
+ public EClass getConditionType() {
+ return RulePackage.eINSTANCE.getLeafCondition();
+ }
+
+ @Override
+ public Set<UniqueSetting> getConditionSettings(LeafCondition condition, EObject domainModel) {
+ final Set<UniqueSetting> registeredSettings = new LinkedHashSet<UniqueSetting>();
+ if (condition == null) {
+ return registeredSettings;
+ }
+ final LeafConditionSettingIterator iterator = new LeafConditionSettingIterator(condition,
+ domainModel, true);
+ while (iterator.hasNext()) {
+ final Setting setting = iterator.next();
+ final UniqueSetting uniqueSetting = UniqueSetting.createSetting(setting);
+ registeredSettings.add(uniqueSetting);
+ }
+ iterator.dispose();
+ return registeredSettings;
+ }
+
+ @Override
+ public Set<VDomainModelReference> getDomainModelReferences(LeafCondition condition) {
+ final Set<VDomainModelReference> references = new LinkedHashSet<VDomainModelReference>();
+ if (condition == null) {
+ return references;
+ }
+ final VDomainModelReference domainModelReference = condition.getDomainModelReference();
+ references.add(domainModelReference);
+ // FIXME
+ //
+ // if a value dmr exists -> create a new dmr that combines the rule value dmr with the rule dmr
+ // in case the rule dmr is a multi reference, a table reference needs to be returned, with a column ref poining
+ // to the value dmr
+
+ // references.add(condition.getValueDomainModelReference());
+
+ return references;
+ }
+
+ @Override
+ public boolean evaluate(LeafCondition condition, EObject domainModel) {
+ return condition.evaluate(domainModel);
+ }
+
+ @Override
+ public boolean evaluateChangedValues(LeafCondition condition, EObject domainModel,
+ Map<Setting, Object> possibleNewValues) {
+ return condition.evaluateChangedValues(domainModel, possibleNewValues);
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/OrConditionService.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/OrConditionService.java
new file mode 100644
index 0000000..a8fac9d
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/OrConditionService.java
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.rule;
+
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.common.spi.UniqueSetting;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.rule.ConditionService;
+import org.eclipse.emf.ecp.view.spi.rule.model.Condition;
+import org.eclipse.emf.ecp.view.spi.rule.model.OrCondition;
+import org.eclipse.emf.ecp.view.spi.rule.model.RulePackage;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+
+/** {@link ConditionService} for conditions of type {@link OrCondition}. */
+@Component
+public class OrConditionService implements ConditionService<OrCondition> {
+
+ private BundleContext bundleContext;
+ private ServiceReference<ConditionServiceManager> conditionServiceManagerReference;
+ private ConditionServiceManager conditionServiceManager;
+
+ @Override
+ public EClass getConditionType() {
+ return RulePackage.eINSTANCE.getOrCondition();
+ }
+
+ @Override
+ public Set<UniqueSetting> getConditionSettings(OrCondition condition, EObject domainModel) {
+ final Set<UniqueSetting> registeredSettings = new LinkedHashSet<UniqueSetting>();
+ final ConditionServiceManager conditionService = getConditionServiceManager();
+ for (final Condition cond : condition.getConditions()) {
+ registeredSettings.addAll(conditionService.getConditionSettings(cond, domainModel));
+ }
+ return registeredSettings;
+ }
+
+ @Override
+ public boolean evaluate(OrCondition condition, EObject domainModel) {
+ return condition.evaluate(domainModel);
+ }
+
+ @Override
+ public boolean evaluateChangedValues(OrCondition condition, EObject domainModel,
+ Map<Setting, Object> possibleNewValues) {
+ return condition.evaluateChangedValues(domainModel, possibleNewValues);
+ }
+
+ @Override
+ public Set<VDomainModelReference> getDomainModelReferences(OrCondition condition) {
+ final Set<VDomainModelReference> references = new HashSet<VDomainModelReference>();
+ final ConditionServiceManager conditionService = getConditionServiceManager();
+ for (final Condition cond : condition.getConditions()) {
+ references.addAll(conditionService.getDomainModelReferences(cond));
+ }
+ return references;
+ }
+
+ /**
+ * Called by the framework when the component gets activated.
+ *
+ * @param bundleContext The {@link BundleContext}
+ */
+ @Activate
+ protected void activate(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ /**
+ * Called by the framework when the component gets deactivated.
+ *
+ * @param bundleContext The {@link BundleContext}
+ */
+ @Deactivate
+ protected void deactivate(BundleContext bundleContext) {
+ if (conditionServiceManagerReference != null) {
+ bundleContext.ungetService(conditionServiceManagerReference);
+ conditionServiceManager = null;
+ }
+ }
+
+ private ConditionServiceManager getConditionServiceManager() {
+ if (conditionServiceManager == null) {
+ conditionServiceManagerReference = bundleContext
+ .getServiceReference(ConditionServiceManager.class);
+ if (conditionServiceManagerReference == null) {
+ throw new IllegalStateException("No ConditionServiceManager available!"); //$NON-NLS-1$
+ }
+ conditionServiceManager = bundleContext.getService(conditionServiceManagerReference);
+ }
+ return conditionServiceManager;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleRegistry.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleRegistry.java
index d801258..d481792 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleRegistry.java
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleRegistry.java
@@ -21,7 +21,6 @@
import java.util.WeakHashMap;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.ecp.common.spi.BidirectionalMap;
import org.eclipse.emf.ecp.common.spi.UniqueSetting;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
@@ -29,12 +28,8 @@
import org.eclipse.emf.ecp.view.spi.model.ModelChangeNotification;
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.rule.model.AndCondition;
import org.eclipse.emf.ecp.view.spi.rule.model.Condition;
-import org.eclipse.emf.ecp.view.spi.rule.model.LeafCondition;
-import org.eclipse.emf.ecp.view.spi.rule.model.OrCondition;
import org.eclipse.emf.ecp.view.spi.rule.model.Rule;
-import org.eclipse.emf.ecp.view.spi.rule.model.impl.LeafConditionSettingIterator;
import org.eclipse.emfforms.spi.core.services.structuralchange.EMFFormsStructuralChangeTester;
/**
@@ -55,6 +50,7 @@
private final ViewModelContext context;
private final Map<VDomainModelReference, Set<T>> dmrsToRules;
private final DomainModelChangeListener domainModelChangeListener;
+ private final ConditionServiceManager conditionServiceManager;
/**
* Default constructor.
@@ -70,16 +66,17 @@
dmrsToRules = new WeakHashMap<VDomainModelReference, Set<T>>();
domainModelChangeListener = new DomainModelChangeListener();
context.registerDomainChangeListener(domainModelChangeListener);
+ conditionServiceManager = context.getService(ConditionServiceManager.class);
}
/**
- * Creates a setting from the given {@link EObject} and the {@link LeafCondition} and register it with the
+ * Creates a setting from the given {@link EObject} and the {@link Condition} and register it with the
* {@link VElement}.
*
* @param renderable
* the {@link VElement} to be updated in case the condition changes
* @param rule
- * the parent rule holding the {@link LeafCondition}
+ * the parent rule holding the {@link Condition}
* @param condition
* contains the attribute that the condition is depending on
* @param domainModel
@@ -88,43 +85,15 @@
* @return the registered {@link UniqueSetting UniqueSettings}
*/
public Set<UniqueSetting> register(VElement renderable, T rule, Condition condition, EObject domainModel) {
-
- final Set<UniqueSetting> registeredSettings = new LinkedHashSet<UniqueSetting>();
- if (condition instanceof LeafCondition) {
- final LeafCondition leafCondition = (LeafCondition) condition;
-
- final VDomainModelReference domainModelReference = leafCondition.getDomainModelReference();
- if (domainModelReference == null) {
- return registeredSettings;
- }
-
- mapDomainToDMRs(rule, Collections.singleton(domainModelReference));
-
- final LeafConditionSettingIterator iterator = new LeafConditionSettingIterator(leafCondition,
- context.getDomainModel(), true);
- while (iterator.hasNext()) {
- final Setting setting = iterator.next();
- final UniqueSetting uniqueSetting = UniqueSetting.createSetting(setting);
- mapSettingToRule(uniqueSetting, leafCondition, rule);
- registeredSettings.add(uniqueSetting);
- }
- mapDomainToDMRs(rule, iterator.getUsedValueDomainModelReferences());
- rulesToRenderables.put(rule, renderable);
- iterator.dispose();
-
- } else if (condition instanceof OrCondition) {
- final OrCondition orCondition = (OrCondition) condition;
- for (final Condition cond : orCondition.getConditions()) {
- registeredSettings.addAll(register(renderable, rule, cond, domainModel));
- }
- } else if (condition instanceof AndCondition) {
- final AndCondition andCondition = (AndCondition) condition;
- for (final Condition cond : andCondition.getConditions()) {
- registeredSettings.addAll(register(renderable, rule, cond, domainModel));
- }
+ rulesToRenderables.put(rule, renderable);
+ final Set<UniqueSetting> settings = conditionServiceManager.getConditionSettings(condition, domainModel);
+ for (final UniqueSetting setting : settings) {
+ mapSettingToRule(setting, condition, rule);
}
-
- return registeredSettings;
+ final Set<VDomainModelReference> domainModelReferences = conditionServiceManager
+ .getDomainModelReferences(condition);
+ mapDomainToDMRs(rule, domainModelReferences);
+ return settings;
}
/**
@@ -192,25 +161,20 @@
public VElement removeCondition(Condition condition) {
VElement ret = null;
T rule = null;
- // we only have to care about leaf conditions since or/and conditions aren't even registered
- if (LeafCondition.class.isInstance(condition)) {
- final Set<UniqueSetting> settings = conditionToSettings.remove(condition);
- if (settings == null) {
- return ret;
+ final Set<UniqueSetting> settings = conditionToSettings.remove(condition);
+ if (settings == null) {
+ return ret;
+ }
+ for (final UniqueSetting setting : settings) {
+ final BidirectionalMap<Condition, T> rules = settingToRules.get(setting);
+ if (rules.keys().contains(condition)) {
+ rule = rules.removeByKey(condition);
}
- for (final UniqueSetting setting : settings) {
- final BidirectionalMap<Condition, T> rules = settingToRules.get(setting);
- if (rules.keys().contains(condition)) {
- rule = rules.removeByKey(condition);
- }
- if (rules.keys().isEmpty()) {
- settingToRules.remove(setting);
- }
+ if (rules.keys().isEmpty()) {
+ settingToRules.remove(setting);
}
}
- conditionToSettings.remove(condition);
-
if (rule != null) {
removeDomainModelChangeListener(rule);
ret = rulesToRenderables.removeByKey(rule);
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleService.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleService.java
index f7cb196..199a781 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleService.java
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/RuleService.java
@@ -42,10 +42,6 @@
import org.eclipse.emf.ecp.view.spi.rule.model.LeafCondition;
import org.eclipse.emf.ecp.view.spi.rule.model.Rule;
import org.eclipse.emf.ecp.view.spi.rule.model.ShowRule;
-import org.eclipse.emfforms.spi.common.report.AbstractReport;
-import org.eclipse.emfforms.spi.common.report.ReportService;
-import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
-import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
import org.eclipse.emfforms.spi.core.services.view.EMFFormsContextListener;
import org.eclipse.emfforms.spi.core.services.view.EMFFormsViewContext;
@@ -66,6 +62,7 @@
private RuleRegistry<EnableRule> enableRuleRegistry;
private RuleRegistry<ShowRule> showRuleRegistry;
+ private ConditionServiceManager conditionServiceManager;
/**
* Instantiates the rule service.
@@ -84,6 +81,7 @@
enableRuleRegistry = new RuleRegistry<EnableRule>(context);
showRuleRegistry = new RuleRegistry<ShowRule>(context);
context.registerEMFFormsContextListener(this);
+ conditionServiceManager = context.getService(ConditionServiceManager.class);
}
private void resetToVisible(VElement renderable) {
@@ -128,7 +126,7 @@
if (rule != null && ruleApplies(rule, ruleType)) {
final Condition condition = rule.getCondition();
if (condition != null && canOverrideParent(evalResult, isOpposite)) {
- final boolean evaluate = condition.evaluate(context.getDomainModel());
+ final boolean evaluate = conditionServiceManager.evaluate(condition, context.getDomainModel());
stateMap.put(renderable, isOpposite(rule) ? !evaluate : evaluate);
didUpdate = true;
}
@@ -208,9 +206,10 @@
if (rule.getCondition() == null) {
result = true;
} else if (isDryRun && hasChanged) {
- result = rule.getCondition().evaluateChangedValues(context.getDomainModel(), possibleValues);
+ result = conditionServiceManager.evaluateChangedValues(rule.getCondition(), context.getDomainModel(),
+ possibleValues);
} else if (!isDryRun) {
- result = rule.getCondition().evaluate(context.getDomainModel());
+ result = conditionServiceManager.evaluate(rule.getCondition(), context.getDomainModel());
} else {
updateMap = false;
}
@@ -513,16 +512,12 @@
if (rule == null) {
return;
}
- if (LeafCondition.class.isInstance(rule.getCondition())) {
- evalNewRules(LeafCondition.class.cast(rule.getCondition()));
- } else {
- final TreeIterator<EObject> eAllContents = rule.getCondition().eAllContents();
- while (eAllContents.hasNext()) {
- final EObject eObject = eAllContents.next();
- if (LeafCondition.class.isInstance(eObject)) {
- evalNewRules(LeafCondition.class.cast(eObject));
- }
- }
+
+ final Set<UniqueSetting> settings = conditionServiceManager.getConditionSettings(rule.getCondition(),
+ context.getDomainModel());
+ for (final UniqueSetting setting : settings) {
+ evalEnable(setting);
+ evalShow(setting);
}
} else if (EnableRule.class.isInstance(notifier)) {
@@ -546,17 +541,6 @@
}
}
- private void evalNewRules(LeafCondition leafCondition) {
- try {
- final Setting setting = context.getService(EMFFormsDatabindingEMF.class)
- .getSetting(leafCondition.getDomainModelReference(), context.getDomainModel());
- evalEnable(UniqueSetting.createSetting(setting));
- evalShow(UniqueSetting.createSetting(setting));
- } catch (final DatabindingFailedException ex) {
- context.getService(ReportService.class).report(new AbstractReport(ex));
- }
- }
-
@Override
public void notifyRemove(Notifier notifier) {
if (VElement.class.isInstance(notifier)) {
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/reporting/LeafConditionDMRResolutionFailedReport.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/reporting/LeafConditionDMRResolutionFailedReport.java
deleted file mode 100644
index 7e882d4..0000000
--- a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/internal/rule/reporting/LeafConditionDMRResolutionFailedReport.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * jfaltermeier - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emf.ecp.view.internal.rule.reporting;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecp.view.spi.rule.model.LeafCondition;
-import org.eclipse.emfforms.spi.common.report.AbstractReport;
-
-/**
- * Indicates that a {@link org.eclipse.emf.ecp.view.spi.model.VDomainModelReference VDomainModelReference} of a
- * {@link LeafCondition} could not be resolved.
- *
- * @author jfaltermeier
- * @since 1.5
- *
- */
-public class LeafConditionDMRResolutionFailedReport extends AbstractReport {
-
- /**
- * Constructs a new {@link LeafConditionDMRResolutionFailedReport}.
- *
- * @param condition the condition
- * @param valueDMR
- * <code>true</code> if resolution for {@link LeafCondition#getValueDomainModelReference()} failed <br>
- * <code>false</code> if resolution for {@link LeafCondition#getDomainModelReference()} failed</br>
- */
- public LeafConditionDMRResolutionFailedReport(LeafCondition condition, boolean valueDMR) {
- super("Not resolved: " //$NON-NLS-1$
- + (valueDMR ? condition.getValueDomainModelReference() : condition.getDomainModelReference())
- + " on leaf condition " + condition, IStatus.WARNING); //$NON-NLS-1$
- }
-
-}
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/spi/rule/ConditionService.java b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/spi/rule/ConditionService.java
new file mode 100644
index 0000000..d257949
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.rule/src/org/eclipse/emf/ecp/view/spi/rule/ConditionService.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.rule;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.common.spi.UniqueSetting;
+import org.eclipse.emf.ecp.view.spi.model.VDomainModelReference;
+import org.eclipse.emf.ecp.view.spi.rule.model.Condition;
+
+/**
+ * The {@link ConditionService} is used to retrieve the relevant information for conditions.
+ *
+ * @param <T> The type of the Condition this service applies to
+ * @author Eugen Neufeld
+ * @since 1.10
+ */
+public interface ConditionService<T extends Condition> {
+
+ /**
+ * The EClass this ConditionService is implemented for.
+ *
+ * @return The EClass of the {@link Condition}
+ */
+ EClass getConditionType();
+
+ /**
+ * The set of {@link UniqueSetting} that are relevant for the provided condition and domain model.
+ *
+ * @param condition The {@link Condition} to get the UniqueSettings for
+ * @param domainModel The {@link EObject} to use for retrieving
+ * @return The Set of UniqueSettings. This Set must not be null.
+ */
+ Set<UniqueSetting> getConditionSettings(T condition, EObject domainModel);
+
+ /**
+ * Evaluates the given condition.
+ *
+ * @param condition The Condition to evaluate
+ * @param domainModel The root domain object of this condition.
+ * @return {@code true}, if the condition matches, {@code false} otherwise
+ */
+ boolean evaluate(T condition, EObject domainModel);
+
+ /**
+ * Evaluates the given condition.
+ *
+ * @param condition The Condition to evaluate
+ * @param domainModel The root domain object of this condition.
+ * @param possibleNewValues
+ * the new value that should be compared against the expected value of the condition
+ * @return {@code true}, if the condition matches, {@code false} otherwise
+ */
+ boolean evaluateChangedValues(T condition, EObject domainModel, Map<Setting, Object> possibleNewValues);
+
+ /**
+ * The Set of {@link VDomainModelReference} that are relevant for the condition.
+ *
+ * @param condition The {@link Condition} to retrieve the VDMRs for
+ * @return The Set of VDomainModelReferences. This Set must not be null.
+ */
+ Set<VDomainModelReference> getDomainModelReferences(T condition);
+}
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 f2e04a9..8721071 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.model.edit/pom.xml
index d2c537e..e0aef17 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 1662fe5..0b92456 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.section.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.section.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.section.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
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 f0c1c6b..4f2e138 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0c5bee0..8aa87f1 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,25 +2,24 @@
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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.section.swt;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.section.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.section.swt;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/SectionLeafSWTRendererService.xml,
- OSGI-INF/SectionNodeSWTRendererService.xml,
- OSGI-INF/SectionedAreaSWTRendererService.xml
+Service-Component: OSGI-INF/SectionLeafSWTRendererService.xml,OSGI-INF/SectionNodeSWTRendererService.xml,OSGI-INF/SectionedAreaSWTRendererService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
@@ -28,5 +27,4 @@
org.eclipse.swt.widgets;version="0.0.0",
org.eclipse.ui.forms.events;version="0.0.0",
org.eclipse.ui.forms.widgets;version="0.0.0",
- org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional,
- javax.inject;version="1.0.0"
+ org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
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 ea5db63..3aec3da 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
index e8a2236..2d75eb3 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionNodeSWTRenderer.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.ecp.view.spi.section.swt;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -304,16 +305,25 @@
@Override
protected void initCollapseState() {
/* top root gets current width as width hint so that further resizes will keep the column width intact */
- for (final Control control : getControls().values()) {
+ final Iterator<Control> iterator = getControls().values().iterator();
+ while (iterator.hasNext()) {
+ final Control control = iterator.next();
final int width = control.getSize().x;
final Object layoutData = control.getLayoutData();
if (GridData.class.isInstance(layoutData)) {
final GridData gridData = (GridData) layoutData;
- if (gridData != null) {
- gridData.widthHint = width;
+ if (gridData == null) {
+ continue;
}
+ gridData.widthHint = width;
+ if (iterator.hasNext()) {
+ continue;
+ }
+ gridData.grabExcessHorizontalSpace = true;
}
+
}
+
handleCollapseState();
}
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionedAreaSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionedAreaSWTRenderer.java
index 8a5e4bc..2d553ac 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionedAreaSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/src/org/eclipse/emf/ecp/view/spi/section/swt/SectionedAreaSWTRenderer.java
@@ -156,7 +156,7 @@
Activator.getDefault().getReportService().report(new RenderingFailedReport(ex));
return columnComposite;
}
-
+ parent.layout(true);
return columnComposite;
}
@@ -173,7 +173,18 @@
return true;
}
- private void setLayoutDataForControl(SWTGridCell gridCell,
+ /**
+ * Sets the LayoutData for the specified control.
+ *
+ * @param gridCell the {@link GridCell} used to render the control
+ * @param gridDescription the {@link GridDescription} of the parent which rendered the control
+ * @param currentRowGridDescription the {@link GridDescription} of the current row
+ * @param fullGridDescription the {@link GridDescription} of the whole container
+ * @param vElement the {@link VElement} to set the layoutData for
+ * @param control the control to set the layout to
+ * @since 1.10
+ */
+ protected void setLayoutDataForControl(SWTGridCell gridCell,
SWTGridDescription gridDescription,
SWTGridDescription currentRowGridDescription,
SWTGridDescription fullGridDescription, VElement vElement,
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 c29a7e8..3cfc522 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/pom.xml
index af45a94..8be84cb 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 5cf3a8f..9496549 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -11,6 +11,6 @@
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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore b/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore
index 122c43f..b656e5b 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.stack.model/model/stack.ecore
@@ -10,6 +10,6 @@
transient="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="StackItem" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Container">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
</eClassifiers>
</ecore:EPackage>
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 ccbdbf1..572da4f 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 cd15808..d4bf710 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,28 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.stack.ui.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.custom;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
-Service-Component: OSGI-INF/SWTStackLayoutRendererService.xml,
- OSGI-INF/stackItemRendererService.xml
+Service-Component: OSGI-INF/SWTStackLayoutRendererService.xml,OSGI-INF/stackItemRendererService.xml
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
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 2f45bfb..cb069ea 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 48a536f..16e6a81 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Stack Layout Viewmodel
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.viewmodel;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.viewmodel/pom.xml
index f53dd16..ec6c082 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.9.0-SNAPSHOT</version>
+ <version>1.10.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 c3f6475..fa4afc2 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,13 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default LayoutProvider
Bundle-SymbolicName: org.eclipse.emf.ecp.view.swt.layout;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
org.eclipse.swt.layout;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
+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 e7ba3c5..ebc86d0 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 af37eae..eaf486d 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/pom.xml
index 5e2f04c..e2206a3 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 dc21031..1e12d8e 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.columnservice/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP View Table Column Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.columnservice;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.columnservice;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.columnservice/pom.xml
index 8d353ee..75bf7d4 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 0d58dd6..c6c0dd0 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,8 +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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.edapt.migration;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.edapt/pom.xml
index 84f5d56..51f113c 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 bd11e45..ef0ae9c 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
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 9d238a7..ebdb7fe 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 e6d26ec..4556609 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.table.generator;version="1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.table.model.util;version="1.9.0"
+ org.eclipse.emf.ecp.view.internal.table.model;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.table.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.table.model.TableDMRConverter.xml
Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore
index 494e6e5..3beaa1f 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/model/table.ecore
@@ -1,46 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="table" nsURI="http://org/eclipse/emf/ecp/view/table/model/150"
- nsPrefix="org.eclipse.emf.ecp.view.table.model">
- <eClassifiers xsi:type="ecore:EClass" name="TableControl" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Control">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="addRemoveDisabled" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="columnConfigurations" upperBound="-1"
- eType="#//TableColumnConfiguration" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="detailEditing" lowerBound="1"
- eType="#//DetailEditing" defaultValueLiteral="None"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="detailView" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//View"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="enableDetailEditingDialog"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TableColumnConfiguration" abstract="true"
- interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="TableDomainModelReference" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//FeaturePathDomainModelReference">
- <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
- <details key="constraints" value="resolveable"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="columnDomainModelReferences"
- upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ReadOnlyColumnConfiguration" eSuperTypes="#//TableColumnConfiguration">
- <eStructuralFeatures xsi:type="ecore:EReference" name="columnDomainReferences"
- upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="DetailEditing">
- <eLiterals name="None" literal="None"/>
- <eLiterals name="WithDialog" value="1" literal="WithDialog"/>
- <eLiterals name="WithPanel" value="2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="WidthConfiguration" eSuperTypes="#//TableColumnConfiguration">
- <eStructuralFeatures xsi:type="ecore:EReference" name="columnDomainReference"
- lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="weight" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="minWidth" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eClassifiers>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ name="table" nsURI="http://org/eclipse/emf/ecp/view/table/model/150"
+ nsPrefix="org.eclipse.emf.ecp.view.table.model">
+ <eClassifiers xsi:type="ecore:EClass" name="TableControl"
+ eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Control">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+ <details key="constraints" value="resolveable" />
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
+ name="addRemoveDisabled" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false" />
+ <eStructuralFeatures xsi:type="ecore:EReference"
+ name="columnConfigurations" upperBound="-1" eType="#//TableColumnConfiguration"
+ containment="true" />
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
+ name="detailEditing" lowerBound="1" eType="#//DetailEditing"
+ defaultValueLiteral="None" />
+ <eStructuralFeatures xsi:type="ecore:EReference"
+ name="detailView"
+ eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//View"
+ containment="true" />
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
+ name="enableDetailEditingDialog"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="false" />
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TableColumnConfiguration"
+ abstract="true" interface="true" />
+ <eClassifiers xsi:type="ecore:EClass" name="TableDomainModelReference"
+ eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//FeaturePathDomainModelReference">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+ <details key="constraints" value="resolveable" />
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EReference"
+ name="columnDomainModelReferences" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
+ containment="true" />
+ <eStructuralFeatures xsi:type="ecore:EReference"
+ name="domainModelReference"
+ eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference"
+ containment="true" />
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ReadOnlyColumnConfiguration"
+ eSuperTypes="#//TableColumnConfiguration">
+ <eStructuralFeatures xsi:type="ecore:EReference"
+ name="columnDomainReferences" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference" />
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="DetailEditing">
+ <eLiterals name="None" literal="None" />
+ <eLiterals name="WithDialog" value="1" literal="WithDialog" />
+ <eLiterals name="WithPanel" value="2" />
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="WidthConfiguration"
+ eSuperTypes="#//TableColumnConfiguration">
+ <eStructuralFeatures xsi:type="ecore:EReference"
+ name="columnDomainReference" lowerBound="1"
+ eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference" />
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
+ name="weight" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" />
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
+ name="minWidth" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" />
+ </eClassifiers>
</ecore:EPackage>
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 910a412..24de0a8 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/internal/table/model/TableDMRConverter.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/internal/table/model/TableDMRConverter.java
index 2460927..d9c1983 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/internal/table/model/TableDMRConverter.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/internal/table/model/TableDMRConverter.java
@@ -38,30 +38,42 @@
public class TableDMRConverter implements DomainModelReferenceConverterEMF {
private EMFFormsDatabindingEMF emfFormsDatabinding;
private ServiceReference<EMFFormsDatabindingEMF> databindingServiceReference;
+ private BundleContext bundleContext;
/**
- * This method is called by the OSGI framework when this {@link DomainModelReferenceConverter} is activated. It
+ * This method is called by the OSGI framework when this {@link DomainModelReferenceConverterEMF} is activated. It
* retrieves the {@link EMFFormsDatabindingEMF EMF Forms databinding service}.
*
* @param bundleContext The {@link BundleContext} of this classes bundle.
*/
@Activate
protected final void activate(BundleContext bundleContext) {
- databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
- emfFormsDatabinding = bundleContext.getService(databindingServiceReference);
-
+ this.bundleContext = bundleContext;
}
/**
- * This method is called by the OSGI framework when this {@link DomainModelReferenceConverter} is deactivated.
+ * This method is called by the OSGI framework when this {@link DomainModelReferenceConverterEMF} is deactivated.
* It frees the {@link EMFFormsDatabindingEMF EMF Forms databinding service}.
*
* @param bundleContext The {@link BundleContext} of this classes bundle.
*/
@Deactivate
protected final void deactivate(BundleContext bundleContext) {
- bundleContext.ungetService(databindingServiceReference);
- emfFormsDatabinding = null;
+ if (databindingServiceReference != null) {
+ bundleContext.ungetService(databindingServiceReference);
+ emfFormsDatabinding = null;
+ }
+ }
+
+ private EMFFormsDatabindingEMF getEMFFormsDatabindingEMF() {
+ if (emfFormsDatabinding == null) {
+ databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
+ if (databindingServiceReference == null) {
+ throw new IllegalStateException("No EMFFormsDatabindingEMF available!"); //$NON-NLS-1$
+ }
+ emfFormsDatabinding = bundleContext.getService(databindingServiceReference);
+ }
+ return emfFormsDatabinding;
}
/**
@@ -101,7 +113,8 @@
throw new DatabindingFailedException(
"The field domainModelReference of the given VTableDomainModelReference must not be null."); //$NON-NLS-1$
}
- return emfFormsDatabinding.getValueProperty(tableDomainModelReference.getDomainModelReference(), object);
+ return getEMFFormsDatabindingEMF().getValueProperty(tableDomainModelReference.getDomainModelReference(),
+ object);
}
/**
@@ -127,7 +140,7 @@
throw new DatabindingFailedException(
"The field domainModelReference of the given VTableDomainModelReference must not be null."); //$NON-NLS-1$
}
- return emfFormsDatabinding.getListProperty(tableDomainModelReference.getDomainModelReference(), object);
+ return getEMFFormsDatabindingEMF().getListProperty(tableDomainModelReference.getDomainModelReference(), object);
}
/**
@@ -153,7 +166,8 @@
throw new DatabindingFailedException(
"The field domainModelReference of the given VTableDomainModelReference must not be null."); //$NON-NLS-1$
}
- final Setting setting = emfFormsDatabinding.getSetting(tableDomainModelReference.getDomainModelReference(),
+ final Setting setting = getEMFFormsDatabindingEMF().getSetting(
+ tableDomainModelReference.getDomainModelReference(),
object);
if (!setting.getEStructuralFeature().isMany()
|| !EReference.class.isInstance(setting.getEStructuralFeature())) {
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VReadOnlyColumnConfiguration.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VReadOnlyColumnConfiguration.java
index c76244f..0dcc1fd 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VReadOnlyColumnConfiguration.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VReadOnlyColumnConfiguration.java
@@ -23,8 +23,8 @@
* The following features are supported:
* </p>
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration#getColumnDomainReferences
- * <em>Column Domain References</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration#getColumnDomainReferences <em>Column
+ * Domain References</em>}</li>
* </ul>
*
* @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getReadOnlyColumnConfiguration()
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java
index 47a410f..a8a9b88 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableControl.java
@@ -24,18 +24,18 @@
* The following features are supported:
* </p>
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isAddRemoveDisabled <em>Add Remove Disabled</em>}
- * </li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getColumnConfigurations
- * <em>Column Configurations</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isAddRemoveDisabled <em>Add Remove
+ * Disabled</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getColumnConfigurations <em>Column
+ * Configurations</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailEditing <em>Detail Editing</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailView <em>Detail View</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isEnableDetailEditingDialog
- * <em>Enable Detail Editing Dialog</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isEnableDetailEditingDialog <em>Enable Detail
+ * Editing Dialog</em>}</li>
* </ul>
*
* @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getTableControl()
- * @model
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='resolveable'"
* @generated
*/
public interface VTableControl extends VControl {
@@ -58,8 +58,8 @@
boolean isAddRemoveDisabled();
/**
- * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isAddRemoveDisabled
- * <em>Add Remove Disabled</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isAddRemoveDisabled <em>Add
+ * Remove Disabled</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -107,8 +107,8 @@
DetailEditing getDetailEditing();
/**
- * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailEditing
- * <em>Detail Editing</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailEditing <em>Detail
+ * Editing</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -137,8 +137,8 @@
VView getDetailView();
/**
- * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailView
- * <em>Detail View</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailView <em>Detail
+ * View</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableDomainModelReference.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableDomainModelReference.java
index d47fe43..280d1b9 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableDomainModelReference.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTableDomainModelReference.java
@@ -26,8 +26,8 @@
* <ul>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getColumnDomainModelReferences
* <em>Column Domain Model References</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getDomainModelReference
- * <em>Domain Model Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getDomainModelReference <em>Domain
+ * Model Reference</em>}</li>
* </ul>
*
* @see org.eclipse.emf.ecp.view.spi.table.model.VTablePackage#getTableDomainModelReference()
@@ -72,9 +72,9 @@
VDomainModelReference getDomainModelReference();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getDomainModelReference
- * <em>Domain Model Reference</em>}' containment reference.
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getDomainModelReference <em>Domain
+ * Model Reference</em>}' containment reference.
* <!-- begin-user-doc -->
*
* @since 1.5
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java
index f3e618a..8358330 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VTablePackage.java
@@ -246,8 +246,8 @@
int TABLE_CONTROL_FEATURE_COUNT = VViewPackage.CONTROL_FEATURE_COUNT + 5;
/**
- * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration
- * <em>Column Configuration</em>}' class.
+ * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration <em>Column
+ * Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -413,11 +413,12 @@
/**
* The feature id for the '<em><b>Min Width</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.9
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
- * @since 1.9
*/
int WIDTH_CONFIGURATION__MIN_WIDTH = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 2;
@@ -433,8 +434,8 @@
int WIDTH_CONFIGURATION_FEATURE_COUNT = TABLE_COLUMN_CONFIGURATION_FEATURE_COUNT + 3;
/**
- * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing <em>Detail Editing</em>
- * }' enum.
+ * The meta object id for the '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing <em>Detail
+ * Editing</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -445,8 +446,8 @@
int DETAIL_EDITING = 5;
/**
- * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl <em>Control</em>
- * }'.
+ * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl
+ * <em>Control</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -457,8 +458,9 @@
EClass getTableControl();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isAddRemoveDisabled <em>Add Remove Disabled</em>}'.
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isAddRemoveDisabled <em>Add Remove
+ * Disabled</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -470,9 +472,9 @@
EAttribute getTableControl_AddRemoveDisabled();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getColumnConfigurations
- * <em>Column Configurations</em>}'.
+ * Returns the meta object for the containment reference list
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getColumnConfigurations <em>Column
+ * Configurations</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -484,8 +486,8 @@
EReference getTableControl_ColumnConfigurations();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailEditing <em>Detail Editing</em>}'.
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailEditing <em>Detail Editing</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -497,8 +499,8 @@
EAttribute getTableControl_DetailEditing();
/**
- * Returns the meta object for the containment reference '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailView <em>Detail View</em>}'.
+ * Returns the meta object for the containment reference
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#getDetailView <em>Detail View</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -510,9 +512,9 @@
EReference getTableControl_DetailView();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isEnableDetailEditingDialog
- * <em>Enable Detail Editing Dialog</em>}'.
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableControl#isEnableDetailEditingDialog <em>Enable Detail
+ * Editing Dialog</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -548,8 +550,8 @@
EClass getTableDomainModelReference();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getColumnDomainModelReferences
+ * Returns the meta object for the containment reference list
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getColumnDomainModelReferences
* <em>Column Domain Model References</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -562,9 +564,9 @@
EReference getTableDomainModelReference_ColumnDomainModelReferences();
/**
- * Returns the meta object for the containment reference '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getDomainModelReference
- * <em>Domain Model Reference</em>}'.
+ * Returns the meta object for the containment reference
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference#getDomainModelReference <em>Domain
+ * Model Reference</em>}'.
* <!-- begin-user-doc -->
*
* @since 1.5
@@ -589,8 +591,8 @@
EClass getReadOnlyColumnConfiguration();
/**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration#getColumnDomainReferences
+ * Returns the meta object for the reference list
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration#getColumnDomainReferences
* <em>Column Domain References</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -603,8 +605,8 @@
EReference getReadOnlyColumnConfiguration_ColumnDomainReferences();
/**
- * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration
- * <em>Width Configuration</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration <em>Width
+ * Configuration</em>}'.
* <!-- begin-user-doc -->
*
* @since 1.9
@@ -616,9 +618,9 @@
EClass getWidthConfiguration();
/**
- * Returns the meta object for the reference '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference
- * <em>Column Domain Reference</em>}'.
+ * Returns the meta object for the reference
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference <em>Column Domain
+ * Reference</em>}'.
* <!-- begin-user-doc -->
*
* @since 1.9
@@ -631,8 +633,8 @@
EReference getWidthConfiguration_ColumnDomainReference();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getWeight <em>Weight</em>}'.
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getWeight <em>Weight</em>}'.
* <!-- begin-user-doc -->
*
* @since 1.9
@@ -645,22 +647,23 @@
EAttribute getWidthConfiguration_Weight();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth <em>Min Width</em>}'.
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth <em>Min Width</em>}'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.9
+ * <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Min Width</em>'.
* @see org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth()
* @see #getWidthConfiguration()
* @generated
- * @since 1.9
*/
EAttribute getWidthConfiguration_MinWidth();
/**
- * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing
- * <em>Detail Editing</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing <em>Detail
+ * Editing</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -764,9 +767,9 @@
EClass TABLE_COLUMN_CONFIGURATION = eINSTANCE.getTableColumnConfiguration();
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableDomainModelReferenceImpl
- * <em>Domain Model Reference</em>}' class.
+ * The meta object literal for the
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableDomainModelReferenceImpl <em>Domain Model
+ * Reference</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -799,9 +802,9 @@
.getTableDomainModelReference_DomainModelReference();
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.impl.VReadOnlyColumnConfigurationImpl
- * <em>Read Only Column Configuration</em>}' class.
+ * The meta object literal for the
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VReadOnlyColumnConfigurationImpl <em>Read Only Column
+ * Configuration</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -858,16 +861,17 @@
/**
* The meta object literal for the '<em><b>Min Width</b></em>' attribute feature.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.9
+ * <!-- end-user-doc -->
*
* @generated
- * @since 1.9
*/
EAttribute WIDTH_CONFIGURATION__MIN_WIDTH = eINSTANCE.getWidthConfiguration_MinWidth();
/**
- * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing
- * <em>Detail Editing</em>}' enum.
+ * The meta object literal for the '{@link org.eclipse.emf.ecp.view.spi.table.model.DetailEditing <em>Detail
+ * Editing</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java
index 49f4ab1..9b47425 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/VWidthConfiguration.java
@@ -24,8 +24,8 @@
* The following features are supported:
* </p>
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference
- * <em>Column Domain Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference <em>Column
+ * Domain Reference</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getWeight <em>Weight</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth <em>Min Width</em>}</li>
* </ul>
@@ -53,9 +53,9 @@
VDomainModelReference getColumnDomainReference();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference
- * <em>Column Domain Reference</em>}' reference.
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getColumnDomainReference <em>Column Domain
+ * Reference</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -112,8 +112,8 @@
int getMinWidth();
/**
- * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth
- * <em>Min Width</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.ecp.view.spi.table.model.VWidthConfiguration#getMinWidth <em>Min
+ * Width</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java
index 54fe041..c611aed 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableControlImpl.java
@@ -36,15 +36,15 @@
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#isAddRemoveDisabled
- * <em>Add Remove Disabled</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#getColumnConfigurations
- * <em>Column Configurations</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#getDetailEditing <em>Detail Editing</em>}
- * </li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#isAddRemoveDisabled <em>Add Remove
+ * Disabled</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#getColumnConfigurations <em>Column
+ * Configurations</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#getDetailEditing <em>Detail
+ * Editing</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#getDetailView <em>Detail View</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#isEnableDetailEditingDialog
- * <em>Enable Detail Editing Dialog</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableControlImpl#isEnableDetailEditingDialog <em>Enable
+ * Detail Editing Dialog</em>}</li>
* </ul>
*
* @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableDomainModelReferenceImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableDomainModelReferenceImpl.java
index 187adeb..3f6988c 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableDomainModelReferenceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTableDomainModelReferenceImpl.java
@@ -52,8 +52,7 @@
* The following features are implemented:
* </p>
* <ul>
- * <li>
- * {@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableDomainModelReferenceImpl#getColumnDomainModelReferences
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableDomainModelReferenceImpl#getColumnDomainModelReferences
* <em>Column Domain Model References</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VTableDomainModelReferenceImpl#getDomainModelReference
* <em>Domain Model Reference</em>}</li>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java
index 874f493..0f683d1 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VTablePackageImpl.java
@@ -334,10 +334,10 @@
/**
* <!-- begin-user-doc -->
+ * @since 1.9
* <!-- end-user-doc -->
*
* @generated
- * @since 1.9
*/
@Override
public EAttribute getWidthConfiguration_MinWidth() {
@@ -529,6 +529,11 @@
*/
protected void createEcoreAnnotations() {
final String source = "http://www.eclipse.org/emf/2002/Ecore"; //$NON-NLS-1$
+ addAnnotation(tableControlEClass,
+ source,
+ new String[] {
+ "constraints", "resolveable" //$NON-NLS-1$ //$NON-NLS-2$
+ });
addAnnotation(tableDomainModelReferenceEClass,
source,
new String[] {
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VWidthConfigurationImpl.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VWidthConfigurationImpl.java
index 2ca5a64..1ab93b1 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VWidthConfigurationImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/impl/VWidthConfigurationImpl.java
@@ -32,10 +32,10 @@
* <ul>
* <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl#getColumnDomainReference
* <em>Column Domain Reference</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl#getWeight <em>Weight</em>}
- * </li>
- * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl#getMinWidth
- * <em>Min Width</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl#getWeight
+ * <em>Weight</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.spi.table.model.impl.VWidthConfigurationImpl#getMinWidth <em>Min
+ * Width</em>}</li>
* </ul>
*
* @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java
index 0d54e2b..9c9afc8 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableAdapterFactory.java
@@ -175,8 +175,8 @@
}
/**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration <em>Column Configuration</em>}'.
+ * Creates a new adapter for an object of class
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableColumnConfiguration <em>Column Configuration</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -191,8 +191,8 @@
}
/**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference <em>Domain Model Reference</em>}'.
+ * Creates a new adapter for an object of class
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference <em>Domain Model Reference</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -207,9 +207,9 @@
}
/**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration
- * <em>Read Only Column Configuration</em>}'.
+ * Creates a new adapter for an object of class
+ * '{@link org.eclipse.emf.ecp.view.spi.table.model.VReadOnlyColumnConfiguration <em>Read Only Column
+ * Configuration</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -241,8 +241,8 @@
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VElement <em>Element</em>
- * }'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VElement
+ * <em>Element</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -273,8 +273,8 @@
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VControl <em>Control</em>
- * }'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.spi.model.VControl
+ * <em>Control</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -305,9 +305,9 @@
}
/**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference
- * <em>Feature Path Domain Model Reference</em>}'.
+ * Creates a new adapter for an object of class
+ * '{@link org.eclipse.emf.ecp.view.spi.model.VFeaturePathDomainModelReference <em>Feature Path Domain Model
+ * Reference</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java
index f079d39..3b34e72 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableValidator.java
@@ -58,6 +58,8 @@
* @generated
*/
public class TableValidator extends EObjectValidator {
+ private static final String VALIDATING_TABLE_CONTROL_KEY = "ValidatingTableControl";
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -189,14 +191,74 @@
*/
public boolean validateTableControl(VTableControl tableControl, DiagnosticChain diagnostics,
Map<Object, Object> context) {
- return validate_EveryDefaultConstraint(tableControl, diagnostics, context);
+ if (!validate_NoCircularContainment(tableControl, diagnostics, context)) {
+ return false;
+ }
+ boolean result = validate_EveryMultiplicityConforms(tableControl, diagnostics, context);
+ if (result || diagnostics != null) {
+ result &= validate_EveryDataValueConforms(tableControl, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryReferenceIsContained(tableControl, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryBidirectionalReferenceIsPaired(tableControl, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryProxyResolves(tableControl, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_UniqueID(tableControl, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryKeyUnique(tableControl, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validate_EveryMapEntryUnique(tableControl, diagnostics, context);
+ }
+ if (result || diagnostics != null) {
+ result &= validateTableControl_resolveable(tableControl, diagnostics, context);
+ }
+ return result;
}
/**
+ * Validates the resolveable constraint of '<em>Control</em>'.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
*
+ * @param tableControl the {@link VTableControl} to check
+ * @param diagnostics the diagnostics
+ * @param context the validation context
+ * <!-- end-user-doc -->
+ * @return the validation result
+ *
+ * @generated NOT
+ * @since 1.10
+ */
+ // CHECKSTYLE.OFF: MethodName
+ public boolean validateTableControl_resolveable(VTableControl tableControl, DiagnosticChain diagnostics,
+ Map<Object, Object> context) {
+ // CHECKSTYLE.ON: MethodName
+ final VDomainModelReference domainModelReference = tableControl.getDomainModelReference();
+ if (domainModelReference == null) {
+ diagnostics
+ .add(createDiagnostic(Diagnostic.ERROR, 0, "No Domain Model Reference set.", //$NON-NLS-1$
+ tableControl, VViewPackage.eINSTANCE.getControl_DomainModelReference()));
+ return false;
+ }
+ if (domainModelReference instanceof VTableDomainModelReference) {
+ context.put(VALIDATING_TABLE_CONTROL_KEY, true);
+ return validateTableDomainModelReference((VTableDomainModelReference) domainModelReference, diagnostics,
+ context);
+ }
+ return viewValidator.validateDomainModelReference(domainModelReference, diagnostics, context);
+ }
+
+ /**
* @generated
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
*/
public boolean validateTableColumnConfiguration(VTableColumnConfiguration tableColumnConfiguration,
DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -286,11 +348,11 @@
// BEGIN COMPLEX CODE
public boolean validateTableDomainModelReference_resolveable(VTableDomainModelReference tableDomainModelReference,
DiagnosticChain diagnostics, Map<Object, Object> context) {
-
// validate path to table
VDomainModelReference pathToMultiRef = tableDomainModelReference.getDomainModelReference();
final EValidator validator;
if (pathToMultiRef != null) {
+ context.put(ViewValidator.ECLASS_KEY, null);
validator = EValidator.Registry.INSTANCE.getEValidator(pathToMultiRef.eClass().getEPackage());
} else {
pathToMultiRef = tableDomainModelReference;
@@ -333,7 +395,9 @@
}
return false;
}
-
+ if (context.containsKey(VALIDATING_TABLE_CONTROL_KEY)) {
+ return true;
+ }
// test if columns are resolveable
final EReference reference = EReference.class.cast(feature);
final EClass referenceType = reference.getEReferenceType();
@@ -367,10 +431,6 @@
if (usableSubclasses.isEmpty()) {
if (diagnostics != null) {
final String message = "Some columns may not be resolvable"; //$NON-NLS-1$
- if (tableDomainModelReference.eContainer() != null) {
- diagnostics.add(createDiagnostic(Diagnostic.WARNING, 0, message,
- tableDomainModelReference.eContainer(), tableDomainModelReference.eContainingFeature()));
- }
diagnostics.add(createDiagnostic(Diagnostic.WARNING, 0, message, tableDomainModelReference,
VTablePackage.eINSTANCE.getTableDomainModelReference_ColumnDomainModelReferences()));
}
@@ -379,10 +439,6 @@
if (diagnostics != null) {
final String message = "Columns are resovable against a subclass of " + referenceType.getName(); //$NON-NLS-1$
- if (tableDomainModelReference.eContainer() != null) {
- diagnostics.add(createDiagnostic(Diagnostic.INFO, 0,
- message, tableDomainModelReference.eContainer(), tableDomainModelReference.eContainingFeature()));
- }
diagnostics.add(createDiagnostic(Diagnostic.INFO, 0, message, tableDomainModelReference,
VTablePackage.eINSTANCE.getTableDomainModelReference_ColumnDomainModelReferences()));
}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.checkstyle b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.checkstyle
new file mode 100644
index 0000000..e1150f8
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+ <file-match-pattern match-pattern=".java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.classpath b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.gitignore b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.gitignore
new file mode 100644
index 0000000..3e2fcc7
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.project b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.project
new file mode 100644
index 0000000..46956c3
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.ecp.view.table.ui.nebula.grid</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..7a7c95a
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..c522e1f
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..1a6b22b
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,419 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..dcf51f5
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8553926
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..270fde6
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..926c039
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,98 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_ANNOTATION=Ignore
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..b7e72d0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..3249d11
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.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
new file mode 100644
index 0000000..8166fe5
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
@@ -0,0 +1,47 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMF Forms Nebula Grid Table UI
+Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.nebula.grid;singleton:=true
+Bundle-Version: 1.10.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.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",
+ org.eclipse.jface.layout;version="0.0.0",
+ org.eclipse.jface.resource;version="0.0.0",
+ org.eclipse.jface.viewers;version="0.0.0",
+ org.eclipse.jface.window;version="0.0.0",
+ org.eclipse.swt;version="0.0.0",
+ org.eclipse.swt.custom;version="0.0.0",
+ org.eclipse.swt.dnd;version="0.0.0",
+ org.eclipse.swt.events;version="0.0.0",
+ org.eclipse.swt.graphics;version="0.0.0",
+ org.eclipse.swt.layout;version="0.0.0",
+ org.eclipse.swt.widgets;version="0.0.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.internal.nebula.grid;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.10.0"
+Service-Component: OSGI-INF/GridControlSWTRendererService.xml
+
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/OSGI-INF/GridControlSWTRendererService.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/OSGI-INF/GridControlSWTRendererService.xml
new file mode 100644
index 0000000..e02391f
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/OSGI-INF/GridControlSWTRendererService.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emf.ecp.view.table.ui.nebula.grid.rendererService">
+ <implementation class="org.eclipse.emf.ecp.view.spi.table.internal.nebula.grid.GridControlSWTRendererService"/>
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+ </service>
+</scr:component>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/about.html b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/about.html
new file mode 100644
index 0000000..82d49bf
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/build.properties b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/build.properties
new file mode 100644
index 0000000..b1fbb77
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/build.properties
@@ -0,0 +1,7 @@
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ OSGI-INF/,\
+ about.html
+source.. = src/
+src.includes = about.html
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
new file mode 100644
index 0000000..c7b55b2
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-bundles-parent</artifactId>
+ <version>1.10.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.10.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridControlSWTRendererService.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridControlSWTRendererService.java
new file mode 100644
index 0000000..c7b8613
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridControlSWTRendererService.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.internal.nebula.grid;
+
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.table.model.DetailEditing;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.nebula.grid.GridControlSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+
+/** Renderer service for the {@link GridControlSWTRenderer}. */
+public class GridControlSWTRendererService implements EMFFormsDIRendererService<VTableControl> {
+
+ @Override
+ public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+ if (!VTableControl.class.isInstance(vElement)) {
+ return NOT_APPLICABLE;
+ }
+ if (DetailEditing.NONE == VTableControl.class.cast(vElement).getDetailEditing()) {
+ return 12;
+ }
+ return NOT_APPLICABLE;
+ }
+
+ @Override
+ public Class<? extends AbstractSWTRenderer<VTableControl>> getRendererClass() {
+ return GridControlSWTRenderer.class;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridCopyKeyListener.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridCopyKeyListener.java
new file mode 100644
index 0000000..0801f4b
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridCopyKeyListener.java
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.internal.nebula.grid;
+
+import org.eclipse.nebula.widgets.grid.Grid;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * {@link KeyListener} for the copy action on a {@link Grid} control.
+ *
+ * @author Alexandra Buzila
+ * @since 1.10
+ *
+ */
+public class GridCopyKeyListener implements KeyListener {
+ private final Clipboard clipboard;
+
+ /**
+ * Constructor.
+ *
+ * @param display the {@link Display} on which to allocate this command's {@link Clipboard}.
+ */
+ public GridCopyKeyListener(Display display) {
+ clipboard = new Clipboard(display);
+ }
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+ // do nothing
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ if ((e.stateMask & SWT.CTRL) != 0 && e.keyCode == 'c') {
+ final Grid grid = (Grid) e.widget;
+
+ final String selectionText = getSelectionAsText(grid);
+ if (selectionText == null || selectionText.isEmpty()) {
+ return;
+ }
+ final String[] data = { selectionText };
+ final TextTransfer[] dataTypes = { TextTransfer.getInstance() };
+
+ clipboard.setContents(data, dataTypes);
+ }
+ }
+
+ /**
+ * Returns the table selection of the {@link Grid} as a formatted string.
+ *
+ * @param grid the {@link Grid} control
+ * @return the selection
+ */
+ public String getSelectionAsText(Grid grid) {
+ final Point[] cellSelection = grid.getCellSelection();
+ final StringBuilder selection = new StringBuilder();
+ int minRow = Integer.MAX_VALUE;
+ int minColumn = Integer.MAX_VALUE;
+ int maxRow = Integer.MIN_VALUE;
+ int maxColumn = Integer.MIN_VALUE;
+ for (final Point point : cellSelection) {
+ final int row = point.y;
+ final int col = point.x;
+ if (row < minRow) {
+ minRow = row;
+ }
+ if (row > maxRow) {
+ maxRow = row;
+ }
+ if (col < minColumn) {
+ minColumn = col;
+ }
+ if (col > maxColumn) {
+ maxColumn = col;
+ }
+ }
+ final int columnSize = maxColumn - minColumn + 1;
+ final int rowSize = maxRow - minRow + 1;
+ final String[][] tableSelection = initializeTableSelection(grid, cellSelection, columnSize, rowSize, minColumn,
+ minRow);
+ for (int i = 0; i < rowSize; i++) {
+ for (int j = 0; j < columnSize; j++) {
+ final String text = tableSelection[j][i];
+ if (j != 0) {
+ selection.append('\t');
+ }
+ if (text != null) {
+ selection.append(text);
+ }
+ }
+ if (i != rowSize - 1) {
+ selection.append('\n');
+ }
+ }
+ return selection.toString();
+ }
+
+ private String[][] initializeTableSelection(Grid grid, Point[] cellSelection, int columnSize, int rowSize,
+ int minColumn,
+ int minRow) {
+ final String[][] tableSelection = new String[columnSize][rowSize];
+ for (int i = 0; i < cellSelection.length; i++) {
+ final int column = cellSelection[i].x;
+ final int row = cellSelection[i].y;
+ final String text = grid.getItem(row).getText(column);
+ tableSelection[column - minColumn][row - minRow] = text;
+ }
+ return tableSelection;
+ }
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridPasteKeyListener.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridPasteKeyListener.java
new file mode 100644
index 0000000..a2256f4
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/internal/nebula/grid/GridPasteKeyListener.java
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.internal.nebula.grid;
+
+import java.util.StringTokenizer;
+
+import org.eclipse.nebula.widgets.grid.Grid;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * {@link KeyListener} for the paste action on a {@link Grid} control.
+ *
+ * @author Alexandra Buzila
+ * @since 1.10
+ *
+ */
+public class GridPasteKeyListener implements KeyListener {
+
+ private final Clipboard clipboard;
+
+ /**
+ * Constructor.
+ *
+ * @param display the {@link Display} on which to allocate this command's {@link Clipboard}.
+ */
+ public GridPasteKeyListener(Display display) {
+ clipboard = new Clipboard(display);
+ }
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+ // do nothing
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ if ((e.stateMask & SWT.CTRL) != 0 && e.keyCode == 'v') {
+ final Grid grid = (Grid) e.widget;
+ final Object contents = clipboard.getContents(TextTransfer.getInstance());
+ if (contents instanceof String) {
+ pasteSelection(grid, (String) contents);
+ }
+ }
+ }
+
+ /**
+ * Pastes the given contents in the grid.
+ *
+ * @param grid the target {@link Grid}
+ * @param contents the contents to paste
+ */
+ public void pasteSelection(Grid grid, String contents) {
+ // ignore if no selection
+ if (grid.getCellSelection().length == 0) {
+ return;
+ }
+ // if multiple items are selected, we take the first one
+ final Point startItem = grid.getCellSelection()[0];
+ final int startColumn = startItem.x;
+ final int startRow = startItem.y;
+
+ int relativeRow = -1;
+ int relativeColumn = -1;
+ final StringTokenizer rowTokenizer = new StringTokenizer(contents, "\n", true); //$NON-NLS-1$
+ while (rowTokenizer.hasMoreTokens()) {
+ relativeRow++;
+ String columnString = rowTokenizer.nextToken();
+ boolean rowUpdate = false;
+ while (rowTokenizer.hasMoreTokens() && columnString.equals("\n")) { //$NON-NLS-1$
+ relativeRow++;
+ columnString = rowTokenizer.nextToken();
+ rowUpdate = true;
+ }
+ if (rowUpdate) {
+ relativeRow--;
+ }
+ final StringTokenizer columnTokenizer = new StringTokenizer(columnString, "\t", true); //$NON-NLS-1$
+ relativeColumn = -1;
+ while (columnTokenizer.hasMoreTokens()) {
+ relativeColumn++;
+ String text = columnTokenizer.nextToken();
+ while (columnTokenizer.hasMoreTokens() && text.equals("\t")) { //$NON-NLS-1$
+ relativeColumn++;
+ text = columnTokenizer.nextToken();
+ }
+ if (!text.equals("\t")) { //$NON-NLS-1$
+ final int insertionIndex = startRow + relativeRow;
+ if (insertionIndex < grid.getItemCount()) {
+ grid.getItem(startRow + relativeRow).setText(startColumn + relativeColumn, text);
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridControlSWTRenderer.java
new file mode 100644
index 0000000..d110143
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridControlSWTRenderer.java
@@ -0,0 +1,186 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.nebula.grid;
+
+import javax.inject.Inject;
+
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.table.internal.nebula.grid.GridCopyKeyListener;
+import org.eclipse.emf.ecp.view.spi.table.internal.nebula.grid.GridPasteKeyListener;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer;
+import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emf.ecp.view.template.style.background.model.VTBackgroundStyleProperty;
+import org.eclipse.emf.ecp.view.template.style.fontProperties.model.VTFontPropertiesStyleProperty;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.swt.table.TableViewerCompositeBuilder;
+import org.eclipse.emfforms.spi.swt.table.TableViewerCreator;
+import org.eclipse.emfforms.spi.swt.table.TableViewerSWTBuilder;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
+import org.eclipse.nebula.jface.gridviewer.GridTableViewer;
+import org.eclipse.nebula.jface.gridviewer.GridViewerEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Item;
+import org.eclipse.swt.widgets.ScrollBar;
+
+/**
+ * @author Jonas Helming
+ * @since 1.10
+ *
+ */
+public class GridControlSWTRenderer extends TableControlSWTRenderer {
+
+ /**
+ * Default constructor.
+ *
+ * @param vElement the view model element to be rendered
+ * @param viewContext the view context
+ * @param emfFormsDatabinding The {@link EMFFormsDatabindingEMF}
+ * @param emfFormsLabelProvider The {@link EMFFormsLabelProvider}
+ * @param reportService The {@link ReportService}
+ * @param vtViewTemplateProvider The {@link VTViewTemplateProvider}
+ * @param imageRegistryService The {@link ImageRegistryService}
+ * @param emfFormsEditSupport The {@link EMFFormsEditSupport}
+ * @since 1.
+ */
+ @Inject
+ // CHECKSTYLE.OFF: ParameterNumber
+ public GridControlSWTRenderer(VTableControl vElement, ViewModelContext viewContext, ReportService reportService,
+ EMFFormsDatabindingEMF emfFormsDatabinding, EMFFormsLabelProvider emfFormsLabelProvider,
+ VTViewTemplateProvider vtViewTemplateProvider, ImageRegistryService imageRegistryService,
+ EMFFormsEditSupport emfFormsEditSupport) {
+ // CHECKSTYLE.ON: ParameterNumber
+ super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider,
+ imageRegistryService, emfFormsEditSupport);
+ }
+
+ /**
+ * {@link TableViewerCreator} for the table control swt renderer. It will create a GridTableViewer with the expected
+ * custom variant data and the correct style properties as defined in the template model.
+ *
+ */
+ protected final class GridTableControlSWTRendererTableViewerCreator implements TableViewerCreator<GridTableViewer> {
+
+ @Override
+ public GridTableViewer createTableViewer(Composite parent) {
+ final GridTableViewer tableViewer = new GridTableViewer(parent,
+ SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
+ tableViewer.getGrid().setData(CUSTOM_VARIANT, TABLE_CUSTOM_VARIANT);
+ tableViewer.getGrid().setHeaderVisible(true);
+ tableViewer.getGrid().setLinesVisible(true);
+ tableViewer.getGrid().setCellSelectionEnabled(true);
+ tableViewer.getGrid().setFooterVisible(false);
+ tableViewer.getGrid().setRowHeaderVisible(true);
+ tableViewer.getGrid().addKeyListener(new GridCopyKeyListener(tableViewer.getGrid().getDisplay()));
+ tableViewer.getGrid().addKeyListener(new GridPasteKeyListener(tableViewer.getGrid().getDisplay()));
+
+ /* Set background color */
+ final VTBackgroundStyleProperty backgroundStyleProperty = getBackgroundStyleProperty();
+ if (backgroundStyleProperty.getColor() != null) {
+ tableViewer.getGrid().setBackground(getSWTColor(backgroundStyleProperty.getColor()));
+ }
+
+ /* Set foreground color */
+ final VTFontPropertiesStyleProperty fontPropertiesStyleProperty = getFontPropertiesStyleProperty();
+ if (fontPropertiesStyleProperty.getColorHEX() != null) {
+ tableViewer.getGrid()
+ .setForeground(getSWTColor(fontPropertiesStyleProperty.getColorHEX()));
+ }
+
+ tableViewer.getGrid().setData(FIXED_COLUMNS, new Integer(1));
+
+ /* manage editing support activation */
+ createTableViewerEditor(tableViewer);
+
+ return tableViewer;
+ }
+
+ /**
+ * This method creates and initialises a {@link GridViewerEditor} for the given {@link GridTableViewer}.
+ *
+ * @param gridTableViewer the table viewer
+ */
+ protected void createTableViewerEditor(final GridTableViewer gridTableViewer) {
+ // TODO Grid
+ // final TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(tableViewer,
+ // new org.eclipse.emf.ecp.edit.internal.swt.controls.ECPFocusCellDrawHighlighter(tableViewer));
+
+ final ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(
+ gridTableViewer) {
+ @Override
+ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+ return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+ || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
+ || event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED
+ && (event.keyCode == SWT.CR || event.keyCode == 16777296)
+ || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
+ }
+ };
+ GridViewerEditor.create(
+ gridTableViewer,
+ actSupport,
+ ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
+ | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
+ }
+ }
+
+ @Override
+ protected TableViewerCreator<GridTableViewer> getTableViewerCreator() {
+ return new GridTableControlSWTRendererTableViewerCreator();
+ }
+
+ @Override
+ // CHECKSTYLE.OFF: ParameterNumber
+ protected TableViewerSWTBuilder getTableViewerSWTBuilder(Composite parent, IObservableList list,
+ IObservableValue labelText, IObservableValue labelTooltipText, TableViewerCompositeBuilder compositeBuilder,
+ ObservableListContentProvider cp, ECPTableViewerComparator comparator,
+ TableControlSWTRendererButtonBarBuilder tableControlSWTRendererButtonBarBuilder) {
+ // CHECKSTYLE.ON: ParameterNumber
+ return GridTableViewerFactory.fillDefaults(parent, SWT.NONE, list, labelText, labelTooltipText)
+ .customizeCompositeStructure(compositeBuilder)
+ .customizeButtons(tableControlSWTRendererButtonBarBuilder)
+ .customizeTableViewerCreation(getTableViewerCreator())
+ .customizeContentProvider(cp)
+ .customizeComparator(comparator);
+
+ }
+
+ @Override
+ protected int getSelectionIndex() {
+ return ((GridTableViewer) getTableViewer()).getGrid().getSelectionIndex();
+ }
+
+ @Override
+ protected Item[] getColumns() {
+ return ((GridTableViewer) getTableViewer()).getGrid().getColumns();
+ }
+
+ @Override
+ protected ScrollBar getHorizontalBar() {
+ return ((GridTableViewer) getTableViewer()).getGrid().getHorizontalBar();
+ }
+
+ @Override
+ protected ScrollBar getVerticalBar() {
+ return ((GridTableViewer) getTableViewer()).getGrid().getVerticalBar();
+ }
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerComposite.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerComposite.java
new file mode 100644
index 0000000..720c19c
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerComposite.java
@@ -0,0 +1,182 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila - initial API and implementation
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.nebula.grid;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.emfforms.spi.swt.table.AbstractTableViewerComposite;
+import org.eclipse.emfforms.spi.swt.table.TableControl;
+import org.eclipse.emfforms.spi.swt.table.TableViewerComparator;
+import org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization;
+import org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization.ColumnDescription;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.layout.AbstractColumnLayout;
+import org.eclipse.jface.viewers.AbstractTableViewer;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.ViewerColumn;
+import org.eclipse.nebula.jface.gridviewer.GridColumnLayout;
+import org.eclipse.nebula.jface.gridviewer.GridTableViewer;
+import org.eclipse.nebula.jface.gridviewer.GridViewerColumn;
+import org.eclipse.nebula.widgets.grid.GridColumn;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Widget;
+
+/**
+ * A {@link Composite} containing a {@link GridTableViewer}.
+ *
+ * @author Jonas Helming
+ *
+ */
+public class GridTableViewerComposite extends AbstractTableViewerComposite {
+
+ private GridTableViewer gridTableViewer;
+
+ /**
+ * Default constructor.
+ *
+ * @param parent the parent {@link Composite}
+ * @param style the style bits
+ * @param inputObject the input object
+ * @param customization the {@link TableViewerSWTCustomization}
+ * @param title the title
+ * @param tooltip the tooltip
+ */
+ GridTableViewerComposite(Composite parent, int style, Object inputObject, TableViewerSWTCustomization customization,
+ IObservableValue title, IObservableValue tooltip) {
+ super(parent, style, inputObject, customization, title, tooltip);
+ }
+
+ @Override
+ public GridTableViewer getTableViewer() {
+ return gridTableViewer;
+ }
+
+ @Override
+ protected AbstractTableViewer createTableViewer(TableViewerSWTCustomization customization,
+ Composite viewerComposite) {
+ // TODO: Grid ugly cast
+ gridTableViewer = (GridTableViewer) customization.createTableViewer(viewerComposite);
+ return gridTableViewer;
+ }
+
+ @Override
+ protected AbstractColumnLayout createLayout(Composite viewerComposite) {
+ final GridColumnLayout layout = new GridColumnLayout();
+ viewerComposite.setLayout(layout);
+ return layout;
+ }
+
+ @Override
+ public Widget[] getColumns() {
+ return gridTableViewer.getGrid().getColumns();
+ }
+
+ @Override
+ public void addColumnListener(ControlListener columnlistener) {
+ for (int i = 0; i < gridTableViewer.getGrid().getColumns().length; i++) {
+ final GridColumn gridColumn = gridTableViewer.getGrid().getColumns()[i];
+ gridColumn.addControlListener(columnlistener);
+ }
+
+ }
+
+ @Override
+ public TableControl getTableControl() {
+ return new TableControl() {
+
+ @Override
+ public boolean isDisposed() {
+ return getTableViewer().getGrid().isDisposed();
+ }
+
+ @Override
+ public int getItemHeight() {
+ return getTableViewer().getGrid().getItemHeight();
+ }
+
+ @Override
+ public boolean getHeaderVisible() {
+ return getTableViewer().getGrid().getHeaderVisible();
+ }
+
+ @Override
+ public int getHeaderHeight() {
+ return getTableViewer().getGrid().getHeaderHeight();
+ }
+ };
+ }
+
+ // TODO: could be refactored to reduce overlap with TableViewerComposite
+ @Override
+ protected ViewerColumn createColumn(ColumnDescription columnDescription,
+ EMFDataBindingContext emfDataBindingContext, AbstractTableViewer tableViewer) {
+ final GridViewerColumnBuilder builder = GridViewerColumnBuilder
+ .create();
+
+ final GridViewerColumn column = builder.setData(RESIZABLE, columnDescription.isResizeable())
+ .setMoveable(columnDescription.isMoveable())
+ .setStyle(columnDescription.getStyleBits())
+ .setData(WEIGHT, columnDescription.getWeight())
+ .setData(MIN_WIDTH, columnDescription.getMinWidth())
+ .build(getTableViewer());
+
+ /* bind text and tooltip */
+ final IObservableValue text = columnDescription.getColumnText();
+ emfDataBindingContext.bindValue(WidgetProperties.text().observe(column.getColumn()), text);
+ // TODO: Grid fix
+ // final IObservableValue tooltipText = columnDescription.getColumnTooltip();
+ // emfDataBindingContext.bindValue(WidgetProperties.tooltipText().observe(column.getColumn()), tooltipText);
+
+ /* set label provider */
+ column.setLabelProvider(columnDescription.createLabelProvider(tableViewer));
+
+ /* set editing support */
+ final Optional<EditingSupport> editingSupport = columnDescription.createEditingSupport(tableViewer);
+ if (editingSupport.isPresent()) {
+ column.setEditingSupport(editingSupport.get());
+ }
+
+ if (columnDescription.getColumnImage().isPresent()) {
+ column.getColumn().setImage(columnDescription.getColumnImage().get());
+ }
+ return column;
+ }
+
+ @Override
+ public void setComparator(final TableViewerComparator comparator, List<Integer> sortableColumns) {
+ for (int i = 0; i < getTableViewer().getGrid().getColumns().length; i++) {
+ if (!sortableColumns.contains(i)) {
+ continue;
+ }
+ final int j = i;
+ final GridColumn tableColumn = getTableViewer().getGrid().getColumns()[i];
+ final SelectionAdapter selectionAdapter = new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ comparator.setColumn(j);
+ tableColumn.setSort(comparator.getDirection());
+ gridTableViewer.refresh();
+ }
+ };
+ tableColumn.addSelectionListener(selectionAdapter);
+ }
+
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerFactory.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerFactory.java
new file mode 100644
index 0000000..780e75e
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerFactory.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.nebula.grid;
+
+import org.eclipse.core.databinding.observable.Observables;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emfforms.spi.swt.table.TableViewerFactory;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A factory to create {@link GridTableViewerComposite GridTableViewerComposites}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public final class GridTableViewerFactory extends TableViewerFactory {
+
+ /** Default constructor. */
+ public GridTableViewerFactory() {
+ super();
+ }
+
+ /**
+ * Use this method if you want to customize any behavior of the {@link GridTableViewerComposite}. This will return
+ * a {@link GridTableViewerSWTBuilder} which allows to customize certain aspects.
+ *
+ * @param composite the parent composite
+ * @param swtStyleBits the style bits which will be passed to the {@link GridTableViewerComposite}
+ * @param input the input object
+ * @return the builder
+ */
+ public static GridTableViewerSWTBuilder fillDefaults(Composite composite, int swtStyleBits, Object input) {
+ return new GridTableViewerSWTBuilder(composite, swtStyleBits, input,
+ Observables.constantObservableValue("", String.class), //$NON-NLS-1$
+ Observables.constantObservableValue("", String.class)); //$NON-NLS-1$
+ }
+
+ /**
+ * Use this method if you want to customize any behavior of the {@link GridTableViewerComposite}. This will return
+ * a {@link GridTableViewerSWTBuilder} which allows to customize certain aspects.
+ *
+ * @param composite the parent composite
+ * @param swtStyleBits the style bits which will be passed to the {@link GridTableViewerComposite}
+ * @param input the input object
+ * @param title the title
+ * @param tooltip the tooltip
+ * @return the builder
+ */
+ public static GridTableViewerSWTBuilder fillDefaults(Composite composite, int swtStyleBits, Object input,
+ IObservableValue title, IObservableValue tooltip) {
+ return new GridTableViewerSWTBuilder(composite, swtStyleBits, input, title, tooltip);
+ }
+
+ /**
+ * Use this method if you want to customize any behavior of the {@link GridTableViewerComposite}. This will return
+ * a {@link GridTableViewerSWTBuilder} which allows to customize certain aspects.
+ *
+ * @param composite the parent composite
+ * @param swtStyleBits the style bits which will be passed to the {@link GridTableViewerComposite}
+ * @param input the input object
+ * @param title the title
+ * @param tooltip the tooltip
+ * @return the builder
+ */
+ public static GridTableViewerSWTBuilder fillDefaults(Composite composite, int swtStyleBits, Object input,
+ String title, String tooltip) {
+ return new GridTableViewerSWTBuilder(composite, swtStyleBits, input,
+ Observables.constantObservableValue(title, String.class),
+ Observables.constantObservableValue(tooltip, String.class));
+ }
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerSWTBuilder.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerSWTBuilder.java
new file mode 100644
index 0000000..acf65e5
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerSWTBuilder.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.nebula.grid;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emfforms.spi.swt.table.TableViewerSWTBuilder;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @author Jonas Helming
+ *
+ */
+public class GridTableViewerSWTBuilder extends TableViewerSWTBuilder {
+
+ /**
+ * Contructs a new instance.
+ *
+ * @param composite the parent composite
+ * @param swtStyleBits the style to apply
+ * @param input the input object
+ * @param title the title of the table viewer
+ * @param tooltip the tooltip
+ */
+ GridTableViewerSWTBuilder(Composite composite, int swtStyleBits, Object input, IObservableValue title,
+ IObservableValue tooltip) {
+ super(composite, swtStyleBits, input, title, tooltip);
+ }
+
+ /**
+ * Call this method after all desired customizations have been passed to the builder. The will create a new
+ * {@link GridTableViewerComposite} with the desired customizations.
+ *
+ * @return the {@link GridTableViewerComposite}
+ */
+ @Override
+ public GridTableViewerComposite create() {
+ return new GridTableViewerComposite(getComposite(), getSwtStyleBits(), getInput(), getCustomization(),
+ getTitle(), getTooltip());
+ }
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridViewerColumnBuilder.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridViewerColumnBuilder.java
new file mode 100644
index 0000000..52be8d5
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridViewerColumnBuilder.java
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.nebula.grid;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.nebula.jface.gridviewer.GridTableViewer;
+import org.eclipse.nebula.jface.gridviewer.GridViewerColumn;
+import org.eclipse.swt.SWT;
+
+/**
+ * @author Jonas Helming
+ *
+ */
+public class GridViewerColumnBuilder {
+ /**
+ * Creates a new viewer column.
+ *
+ * @param tableViewer the parent table viewer
+ * @return the {@link GridViewerColumn}
+ */
+ protected GridViewerColumn buildViewerColumn(GridTableViewer tableViewer) {
+ return new GridViewerColumn(tableViewer, style);
+ }
+
+ /**
+ *
+ * @return creates an instance of a {@link GridViewerColumnBuilder}
+ */
+ public static GridViewerColumnBuilder create() {
+ return new GridViewerColumnBuilder();
+ }
+
+ /**
+ * Creates and customizes a {@link GridViewerColumn} for the given table viewer.
+ *
+ * @param tableViewer the target {@link GridTableViewer}
+ * @return the {@link GridViewerColumn}
+ * @see #setText(GridViewerColumn)
+ * @see #setToolTipText(GridViewerColumn)
+ * @see #setResizable(boolean)
+ * @see #setMoveable(boolean)
+ * @see #setData(GridViewerColumn)
+ * @see #setWidth(GridViewerColumn)
+ */
+ public GridViewerColumn build(GridTableViewer tableViewer) {
+ final GridViewerColumn column = buildViewerColumn(tableViewer);
+ setText(column);
+ setToolTipText(column);
+ setResizable(column);
+ setMoveable(column);
+ setData(column);
+ setWidth(column);
+ return column;
+ }
+
+ private Boolean isResizable;
+ private Boolean isMoveable;
+ private String text;
+ private String tooltip;
+ private final Map<String, Object> data = new LinkedHashMap<String, Object>();
+ private Integer width;
+ private Integer style = SWT.NONE;
+
+ /**
+ * Configures the text of the {@link GridViewerColumn}.
+ *
+ * @param text the text to set
+ * @return the GridViewerColumnBuilder instance
+ */
+ public GridViewerColumnBuilder setText(String text) {
+ this.text = text;
+ return this;
+ }
+
+ /**
+ * Configures the tooltip text of the {@link GridViewerColumn}.
+ *
+ * @param tooltip the tooltip text to set
+ * @return the GridViewerColumnBuilder instance
+ */
+ public GridViewerColumnBuilder setToolTipText(String tooltip) {
+ this.tooltip = tooltip;
+ return this;
+ }
+
+ /**
+ * Configures whether the {@link GridViewerColumn} is resizable.
+ *
+ * @param isResizable the value to set
+ * @return the GridViewerColumnBuilder instance
+ */
+ public GridViewerColumnBuilder setResizable(boolean isResizable) {
+ this.isResizable = isResizable;
+ return this;
+ }
+
+ /**
+ * Configures whether the {@link GridViewerColumn} is moveable.
+ *
+ * @param isMoveable the value to set
+ * @return the GridViewerColumnBuilder instance
+ */
+ public GridViewerColumnBuilder setMoveable(boolean isMoveable) {
+ this.isMoveable = isMoveable;
+ return this;
+ }
+
+ /**
+ * Configures the application data to be set for the {@link GridViewerColumn}.
+ *
+ * @param key the data key
+ * @param value the value
+ * @return the GridViewerColumnBuilder instance
+ */
+ public GridViewerColumnBuilder setData(String key, Object value) {
+ data.put(key, value);
+ return this;
+ }
+
+ /**
+ * Configures the style of the {@link GridViewerColumn}.
+ *
+ * @param style the style bits to set
+ * @return the GridViewerColumnBuilder instance
+ */
+ public GridViewerColumnBuilder setStyle(int style) {
+ this.style = style;
+ return this;
+ }
+
+ /**
+ * Configures the width of the {@link GridViewerColumn}.
+ *
+ * @param width the width of the column
+ * @return the GridViewerColumnBuilder instance
+ */
+ public GridViewerColumnBuilder setWidth(int width) {
+ this.width = width;
+ return this;
+ }
+
+ private void setText(GridViewerColumn column) {
+ if (text != null) {
+ column.getColumn().setText(text);
+ }
+ }
+
+ private void setToolTipText(GridViewerColumn column) {
+ if (tooltip != null) {
+ // TODO: Grid: correct?
+ column.getColumn().setHeaderTooltip(tooltip);
+ }
+ }
+
+ private void setResizable(GridViewerColumn column) {
+ if (isResizable != null) {
+ // TODO Grid needed?
+ // column.getColumn().setResizable(isResizable);
+ }
+ }
+
+ private void setMoveable(GridViewerColumn column) {
+ if (isMoveable != null) {
+ column.getColumn().setMoveable(true);
+
+ }
+ }
+
+ private void setData(GridViewerColumn column) {
+ for (final Entry<String, Object> entry : data.entrySet()) {
+ column.getColumn().setData(entry.getKey(), entry.getValue());
+ }
+ }
+
+ private void setWidth(GridViewerColumn column) {
+ if (width != null) {
+ column.getColumn().setWidth(width);
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.checkstyle b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.checkstyle
new file mode 100644
index 0000000..19c5477
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+ <file-match-pattern match-pattern=".java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.classpath b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.project b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.project
new file mode 100644
index 0000000..d615504
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.project
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.ecp.view.table.ui.rcp</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/.api_filters
new file mode 100644
index 0000000..772b77c
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/.api_filters
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emf.ecp.view.table.ui.swt" version="2">
+ <resource path="META-INF/MANIFEST.MF">
+ <filter comment="SPI Change in 1.6" id="923795461">
+ <message_arguments>
+ <message_argument value="1.6.0"/>
+ <message_argument value="1.5.0"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/table/swt/DetailDialog.java" type="org.eclipse.emf.ecp.view.spi.table.swt.DetailDialog">
+ <filter comment="SPI Change in 1.6" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.DetailDialog"/>
+ <message_argument value="DetailDialog(Shell, EObject, VTableControl)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlDetailDialogSWTRenderer.java" type="org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailDialogSWTRenderer">
+ <filter comment="SPI Change in 1.6" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailDialogSWTRenderer"/>
+ <message_argument value="TableControlDetailDialogSWTRenderer()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.8.0" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailDialogSWTRenderer"/>
+ <message_argument value="TableControlDetailDialogSWTRenderer(VTableControl, ViewModelContext, ReportService, EMFFormsDatabinding, EMFFormsLabelProvider, VTViewTemplateProvider, ImageRegistryService, EMFFormsEditSupport)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlDetailPanelRenderer.java" type="org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailPanelRenderer">
+ <filter comment="SPI Change in 1.6" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailPanelRenderer"/>
+ <message_argument value="TableControlDetailPanelRenderer()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.8.0" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailPanelRenderer"/>
+ <message_argument value="TableControlDetailPanelRenderer(VTableControl, ViewModelContext, ReportService, EMFFormsDatabinding, EMFFormsLabelProvider, VTViewTemplateProvider, ImageRegistryService, EMFFormsEditSupport)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change in 1.6" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailPanelRenderer"/>
+ <message_argument value="deleteRows(List<EObject>, EStructuralFeature.Setting)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java" type="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer">
+ <filter comment="SPI Change 1.8.0" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer"/>
+ <message_argument value="TableControlSWTRenderer(VTableControl, ViewModelContext, ReportService, EMFFormsDatabinding, EMFFormsLabelProvider, VTViewTemplateProvider, ImageRegistryService, EMFFormsEditSupport)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer"/>
+ <message_argument value="createCellEditor(EObject, EStructuralFeature, Table)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer"/>
+ <message_argument value="getTableViewer()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer"/>
+ <message_argument value="setTableViewer(TableViewer)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java" type="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer$ECPCellLabelProvider">
+ <filter comment="SPI Change 1.10.0" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer.ECPCellLabelProvider"/>
+ <message_argument value="ECPCellLabelProvider(TableControlSWTRenderer, EStructuralFeature, CellEditor, IObservableMap, VTableControl, VDomainModelReference, Table)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..c948297
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,418 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8bc4bb4
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000..f29e940
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5abaa92
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
@@ -0,0 +1,31 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Table UI RCP
+Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.rcp
+Bundle-Version: 1.10.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: Eclipse Modeling Project
+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.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.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.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.10.0"
+Import-Package: javax.inject;version="1.0.0",
+ org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
+Service-Component: OSGI-INF/TableControlRCPRendererService.xml,
+ OSGI-INF/TableControlDetailDialogRCPRendererService.xml,
+ OSGI-INF/TableControlDetailPanelRCPRendererService.xml
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlDetailDialogRCPRendererService.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlDetailDialogRCPRendererService.xml
new file mode 100644
index 0000000..5f5a5ff
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlDetailDialogRCPRendererService.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="TableControlDetailDialogRCPRendererService">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+ </service>
+ <implementation class="org.eclipse.emf.ecp.view.internal.table.ui.rcp.TableControlDetailDialogRCPRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlDetailPanelRCPRendererService.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlDetailPanelRCPRendererService.xml
new file mode 100644
index 0000000..d89c840
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlDetailPanelRCPRendererService.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="TableControlDetailPanelRCPRendererService">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+ </service>
+ <implementation class="org.eclipse.emf.ecp.view.internal.table.ui.rcp.TableControlDetailPanelRCPRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlRCPRendererService.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlRCPRendererService.xml
new file mode 100644
index 0000000..3ef6cc1
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/OSGI-INF/TableControlRCPRendererService.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="TableControlRCPRendererService">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+ </service>
+ <implementation class="org.eclipse.emf.ecp.view.internal.table.ui.rcp.TableControlRCPRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/about.html b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/build.properties b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/build.properties
new file mode 100644
index 0000000..0565497
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ about.html,\
+ OSGI-INF/
+src.includes = about.html
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
new file mode 100644
index 0000000..95bca06
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-bundles-parent</artifactId>
+ <version>1.10.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.10.0-SNAPSHOT</version>
+
+</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlDetailDialogRCPRendererService.java b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlDetailDialogRCPRendererService.java
new file mode 100644
index 0000000..400dcfe
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlDetailDialogRCPRendererService.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.table.ui.rcp;
+
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.table.model.DetailEditing;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.ui.rcp.TableControlDetailDialogRCPRenderer;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * {@link EMFFormsDIRendererService} for the {@link TableControlDetailDialogRCPRenderer}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+@Component(name = "TableControlDetailDialogRCPRendererService", service = EMFFormsDIRendererService.class)
+public class TableControlDetailDialogRCPRendererService implements EMFFormsDIRendererService<VTableControl> {
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.swt.core.EMFFormsRendererService#isApplicable(VElement,ViewModelContext)
+ */
+ @Override
+ public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+ if (!VTableControl.class.isInstance(vElement)) {
+ return NOT_APPLICABLE;
+ }
+ if (DetailEditing.WITH_DIALOG == VTableControl.class.cast(vElement).getDetailEditing()) {
+ return 11;
+ }
+ return NOT_APPLICABLE;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#getRendererClass()
+ */
+ @Override
+ public Class<? extends AbstractSWTRenderer<VTableControl>> getRendererClass() {
+ return TableControlDetailDialogRCPRenderer.class;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlDetailPanelRCPRendererService.java b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlDetailPanelRCPRendererService.java
new file mode 100644
index 0000000..e4a7e05
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlDetailPanelRCPRendererService.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.table.ui.rcp;
+
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.table.model.DetailEditing;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.ui.rcp.TableControlDetailPanelRCPRenderer;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * {@link EMFFormsDIRendererService} for the {@link TableControlDetailPanelRCPRenderer}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+@Component(name = "TableControlDetailPanelRCPRendererService", service = EMFFormsDIRendererService.class)
+public class TableControlDetailPanelRCPRendererService implements EMFFormsDIRendererService<VTableControl> {
+
+ @Override
+ public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+ if (!VTableControl.class.isInstance(vElement)) {
+ return NOT_APPLICABLE;
+ }
+ if (DetailEditing.WITH_PANEL == VTableControl.class.cast(vElement).getDetailEditing()) {
+ return 11;
+ }
+ return NOT_APPLICABLE;
+ }
+
+ @Override
+ public Class<? extends AbstractSWTRenderer<VTableControl>> getRendererClass() {
+ return TableControlDetailPanelRCPRenderer.class;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlRCPRendererService.java b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlRCPRendererService.java
new file mode 100644
index 0000000..1028399
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/internal/table/ui/rcp/TableControlRCPRendererService.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.table.ui.rcp;
+
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.table.model.DetailEditing;
+import org.eclipse.emf.ecp.view.spi.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.ui.rcp.TableControlRCPRenderer;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * {@link EMFFormsDIRendererService} for the {@link TableControlRCPRenderer}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+@Component(name = "TableControlRCPRendererService", service = EMFFormsDIRendererService.class)
+public class TableControlRCPRendererService implements EMFFormsDIRendererService<VTableControl> {
+
+ @Override
+ public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+ if (!VTableControl.class.isInstance(vElement)) {
+ return NOT_APPLICABLE;
+ }
+ if (DetailEditing.NONE == VTableControl.class.cast(vElement).getDetailEditing()) {
+ return 11;
+ }
+ return NOT_APPLICABLE;
+ }
+
+ @Override
+ public Class<? extends AbstractSWTRenderer<VTableControl>> getRendererClass() {
+ return TableControlRCPRenderer.class;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/CutCopyPasteListener.java b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/CutCopyPasteListener.java
new file mode 100644
index 0000000..99e9b6b
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/CutCopyPasteListener.java
@@ -0,0 +1,133 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.ui.rcp;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.UnexecutableCommand;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.edit.command.CutToClipboardCommand;
+import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.CopyAction;
+import org.eclipse.emf.edit.ui.action.CutAction;
+import org.eclipse.emf.edit.ui.action.PasteAction;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.ui.actions.BaseSelectionListenerAction;
+
+/**
+ * On creation this listener registers itself on a given {@link TableViewer} and register the according EMF
+ * Cut/Copy/Paste-Actions. They are triggered using keybindings.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public class CutCopyPasteListener implements KeyListener, ISelectionChangedListener {
+
+ private final CutAction cutAction;
+ private final CopyAction copyAction;
+ private final PasteAction pasteAction;
+
+ private EObject parent;
+ private EStructuralFeature feature;
+
+ /**
+ * Constructs this listener.
+ *
+ * @param tableViewer the {@link TableViewer}
+ * @param editingDomain the {@link EditingDomain} (contains the used clipboard)
+ * @param setting the parent EObject on which the paste will be performed
+ */
+ public CutCopyPasteListener(TableViewer tableViewer, EditingDomain editingDomain, Setting setting) {
+ parent = setting.getEObject();
+ feature = setting.getEStructuralFeature();
+ cutAction = new CutAction(editingDomain) {
+ @Override
+ public Command createCommand(Collection<?> selection) {
+ return CutToClipboardCommand.create(domain, parent, feature, selection);
+ }
+ };
+ copyAction = new CopyAction(editingDomain);
+ pasteAction = new PasteAction(editingDomain) {
+ @Override
+ public Command createCommand(Collection<?> selection) {
+ if (selection.size() == 1) {
+ return PasteFromClipboardCommand.create(domain, parent, feature);
+ }
+ return UnexecutableCommand.INSTANCE;
+ }
+ };
+ tableViewer.getTable().addKeyListener(this);
+ tableViewer.addSelectionChangedListener(this);
+ }
+
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ final IStructuredSelection currentSelection = event.getSelection() instanceof IStructuredSelection
+ ? (IStructuredSelection) event.getSelection() : new StructuredSelection();
+ cutAction.selectionChanged(currentSelection);
+ copyAction.selectionChanged(currentSelection);
+ }
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+ /* no op */
+ }
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ if (isActivated(e, SWT.CTRL, 'x')) {
+ execute(cutAction);
+ } else if (isActivated(e, SWT.CTRL, 'c')) {
+ execute(copyAction);
+ } else if (isActivated(e, SWT.CTRL, 'v')) {
+ /*
+ * set selection to parent to recheck enabled state. This works only, because keybindings can be used any
+ * time. If we would also want a menu, we need to handle this differently.
+ */
+ pasteAction.selectionChanged(new StructuredSelection(parent));
+ execute(pasteAction);
+ }
+ }
+
+ private static void execute(BaseSelectionListenerAction delegatedAction) {
+ if (!delegatedAction.isEnabled()) {
+ return;
+ }
+ delegatedAction.run();
+ }
+
+ private static boolean isActivated(KeyEvent event, int swtMask, char c) {
+ return (event.stateMask & swtMask) == swtMask && event.keyCode == c;
+ }
+
+ /**
+ * Called to notify this listener that the domain model has changed.
+ *
+ * @param setting the new table setting
+ */
+ public void rootDomainModelChanged(Setting setting) {
+ parent = setting.getEObject();
+ feature = setting.getEStructuralFeature();
+ }
+
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlDetailDialogRCPRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlDetailDialogRCPRenderer.java
new file mode 100644
index 0000000..c49c85a
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlDetailDialogRCPRenderer.java
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.ui.rcp;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+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.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailDialogSWTRenderer;
+import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
+import org.eclipse.emfforms.spi.swt.table.AbstractTableViewerComposite;
+import org.eclipse.jface.viewers.AbstractTableViewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * {@link TableControlDetailDialogSWTRenderer} which also supports cut/copy/paste.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public class TableControlDetailDialogRCPRenderer extends TableControlDetailDialogSWTRenderer {
+ /**
+ * Default constructor.
+ *
+ * @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 imageRegistryService The {@link ImageRegistryService}
+ * @param emfFormsEditSupport The {@link EMFFormsEditSupport}
+ * @since 1.8
+ */
+ @Inject
+ // CHECKSTYLE.OFF: ParameterNumber
+ public TableControlDetailDialogRCPRenderer(
+ VTableControl vElement,
+ ViewModelContext viewContext,
+ ReportService reportService,
+ EMFFormsDatabindingEMF emfFormsDatabinding,
+ EMFFormsLabelProvider emfFormsLabelProvider,
+ VTViewTemplateProvider vtViewTemplateProvider,
+ ImageRegistryService imageRegistryService,
+ EMFFormsEditSupport emfFormsEditSupport) {
+ // CHECKSTYLE.ON: ParameterNumber
+ super(
+ vElement,
+ viewContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ vtViewTemplateProvider,
+ imageRegistryService,
+ emfFormsEditSupport);
+ }
+
+ @Override
+ protected Control renderControl(SWTGridCell gridCell, Composite parent)
+ throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+ final Control control = super.renderControl(gridCell, parent);
+ if (AbstractTableViewerComposite.class.isInstance(control)) {
+ try {
+ final AbstractTableViewer tableViewer = AbstractTableViewerComposite.class.cast(control)
+ .getTableViewer();
+ final EditingDomain editingDomain = getEditingDomain(getViewModelContext().getDomainModel());
+ final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
+ getViewModelContext().getDomainModel());
+ TableControlRCPRenderer.enableCutCopyPaste(tableViewer, editingDomain, setting);
+ } catch (final DatabindingFailedException ex) {
+ getReportService().report(new AbstractReport(ex, "Enabling Cut Copy Paste failed")); //$NON-NLS-1$
+ }
+ }
+ return control;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlDetailPanelRCPRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlDetailPanelRCPRenderer.java
new file mode 100644
index 0000000..4e4870d
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlDetailPanelRCPRenderer.java
@@ -0,0 +1,99 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.ui.rcp;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+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.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.swt.TableControlDetailPanelRenderer;
+import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
+import org.eclipse.emfforms.spi.swt.table.AbstractTableViewerComposite;
+import org.eclipse.jface.viewers.AbstractTableViewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * {@link TableControlDetailPanelRenderer} which also supports cut/copy/paste.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public class TableControlDetailPanelRCPRenderer extends TableControlDetailPanelRenderer {
+ /**
+ * Default constructor.
+ *
+ * @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 imageRegistryService The {@link ImageRegistryService}
+ * @param emfFormsEditSupport The {@link EMFFormsEditSupport}
+ * @since 1.8
+ */
+ @Inject
+ // CHECKSTYLE.OFF: ParameterNumber
+ public TableControlDetailPanelRCPRenderer(
+ VTableControl vElement,
+ ViewModelContext viewContext,
+ ReportService reportService,
+ EMFFormsDatabindingEMF emfFormsDatabinding,
+ EMFFormsLabelProvider emfFormsLabelProvider,
+ VTViewTemplateProvider vtViewTemplateProvider,
+ ImageRegistryService imageRegistryService,
+ EMFFormsEditSupport emfFormsEditSupport) {
+ // CHECKSTYLE.ON: ParameterNumber
+ super(
+ vElement,
+ viewContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ vtViewTemplateProvider,
+ imageRegistryService,
+ emfFormsEditSupport);
+ }
+
+ @Override
+ protected Control renderControl(SWTGridCell gridCell, Composite parent)
+ throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+ final Control control = super.renderControl(gridCell, parent);
+ if (AbstractTableViewerComposite.class.isInstance(control)) {
+ try {
+ final AbstractTableViewer tableViewer = AbstractTableViewerComposite.class.cast(control)
+ .getTableViewer();
+ final EditingDomain editingDomain = getEditingDomain(getViewModelContext().getDomainModel());
+ final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
+ getViewModelContext().getDomainModel());
+ TableControlRCPRenderer.enableCutCopyPaste(tableViewer, editingDomain, setting);
+ } catch (final DatabindingFailedException ex) {
+ getReportService().report(new AbstractReport(ex, "Enabling Cut Copy Paste failed")); //$NON-NLS-1$
+ }
+ }
+ return control;
+ }
+}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlRCPRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlRCPRenderer.java
new file mode 100644
index 0000000..5163608
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/src/org/eclipse/emf/ecp/view/spi/table/ui/rcp/TableControlRCPRenderer.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.ui.rcp;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.ecore.EStructuralFeature.Setting;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+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.table.model.VTableControl;
+import org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer;
+import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emfforms.spi.common.report.AbstractReport;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
+import org.eclipse.emfforms.spi.swt.table.AbstractTableViewerComposite;
+import org.eclipse.jface.viewers.AbstractTableViewer;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+/**
+ * {@link TableControlSWTRenderer} which also supports cut/copy/paste.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public class TableControlRCPRenderer extends TableControlSWTRenderer {
+
+ private static CutCopyPasteListener cutCopyPasteListener;
+
+ /**
+ * Default constructor.
+ *
+ * @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 imageRegistryService The {@link ImageRegistryService}
+ * @param emfFormsEditSupport The {@link EMFFormsEditSupport}
+ * @since 1.8
+ */
+ @Inject
+ // CHECKSTYLE.OFF: ParameterNumber
+ public TableControlRCPRenderer(
+ VTableControl vElement,
+ ViewModelContext viewContext,
+ ReportService reportService,
+ EMFFormsDatabindingEMF emfFormsDatabinding,
+ EMFFormsLabelProvider emfFormsLabelProvider,
+ VTViewTemplateProvider vtViewTemplateProvider,
+ ImageRegistryService imageRegistryService,
+ EMFFormsEditSupport emfFormsEditSupport) {
+ // CHECKSTYLE.ON: ParameterNumber
+ super(
+ vElement,
+ viewContext,
+ reportService,
+ emfFormsDatabinding,
+ emfFormsLabelProvider,
+ vtViewTemplateProvider,
+ imageRegistryService,
+ emfFormsEditSupport);
+ }
+
+ @Override
+ protected Control renderControl(SWTGridCell gridCell, Composite parent)
+ throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
+ final Control control = super.renderControl(gridCell, parent);
+ if (AbstractTableViewerComposite.class.isInstance(control)) {
+ try {
+ final AbstractTableViewer tableViewer = AbstractTableViewerComposite.class.cast(control)
+ .getTableViewer();
+ final EditingDomain editingDomain = getEditingDomain(getViewModelContext().getDomainModel());
+ final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
+ getViewModelContext().getDomainModel());
+ enableCutCopyPaste(tableViewer, editingDomain, setting);
+ } catch (final DatabindingFailedException ex) {
+ getReportService().report(new AbstractReport(ex, "Enabling Cut Copy Paste failed")); //$NON-NLS-1$
+ }
+ }
+ return control;
+ }
+
+ /**
+ * Enables cut copy paste, if possible.
+ *
+ * @param tableViewer the {@link TableViewer}
+ * @param editingDomain the {@link EditingDomain}
+ * @param setting the {@link Setting} displayed in the table
+ */
+ static void enableCutCopyPaste(AbstractTableViewer tableViewer, EditingDomain editingDomain,
+ Setting setting) {
+ if (!TableViewer.class.isInstance(tableViewer)) {
+ return;
+ }
+ cutCopyPasteListener = new CutCopyPasteListener((TableViewer) tableViewer, editingDomain, setting);
+ }
+
+ @Override
+ protected void rootDomainModelChanged() throws DatabindingFailedException {
+ super.rootDomainModelChanged();
+ final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
+ getViewModelContext().getDomainModel());
+ cutCopyPasteListener.rootDomainModelChanged(setting);
+
+ }
+
+}
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 8bab25d..2afeb69 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/PersistTableStateServiceFactory.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate/pom.xml
index 2bcd5ff..867268d 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/.settings/.api_filters
index 6201fb1..772b77c 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/.settings/.api_filters
@@ -57,5 +57,31 @@
<message_argument value="TableControlSWTRenderer(VTableControl, ViewModelContext, ReportService, EMFFormsDatabinding, EMFFormsLabelProvider, VTViewTemplateProvider, ImageRegistryService, EMFFormsEditSupport)"/>
</message_arguments>
</filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer"/>
+ <message_argument value="createCellEditor(EObject, EStructuralFeature, Table)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer"/>
+ <message_argument value="getTableViewer()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer"/>
+ <message_argument value="setTableViewer(TableViewer)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java" type="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer$ECPCellLabelProvider">
+ <filter comment="SPI Change 1.10.0" id="338722907">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.table.swt.TableControlSWTRenderer.ECPCellLabelProvider"/>
+ <message_argument value="ECPCellLabelProvider(TableControlSWTRenderer, EStructuralFeature, CellEditor, IObservableMap, VTableControl, VDomainModelReference, Table)"/>
+ </message_arguments>
+ </filter>
</resource>
</component>
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 f9dc59e..5d294e6 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,35 +2,36 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test",
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/tableDetailDialogRendererService.xml,OSGI-INF/tableDetailPanelRendererService.xml,OSGI-INF/tableRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.edit.ui.dnd;version="0.0.0",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.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",
@@ -40,6 +41,7 @@
org.eclipse.jface.window;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.custom;version="0.0.0",
+ org.eclipse.swt.dnd;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
org.eclipse.swt.layout;version="0.0.0",
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 ed99c40..3d1b00f 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java
index 05286ca..c5da636 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableConfigurationHelper.java
@@ -21,8 +21,7 @@
import org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization.ColumnDescription;
import org.eclipse.jface.viewers.ColumnPixelData;
import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Widget;
/**
* Helper class for retrieving configuration information.
@@ -106,11 +105,10 @@
*
* @param tableControl the {@link VTableControl} containing the column configuration
* @param domainModelReference the column {@link VDomainModelReference}
- * @param swtTable the swt table
* @param tableColumn the table column
*/
public static void updateWidthConfiguration(VTableControl tableControl, VDomainModelReference domainModelReference,
- Table swtTable, TableColumn tableColumn) {
+ Widget tableColumn) {
final Object layoutData = tableColumn.getData(LAYOUT_DATA);
if (!ColumnPixelData.class.isInstance(layoutData) && !ColumnWeightData.class.isInstance(layoutData)) {
return;
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableControlSWTRendererService.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableControlSWTRendererService.java
index b467d1d..fd84c36 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableControlSWTRendererService.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/internal/table/swt/TableControlSWTRendererService.java
@@ -45,7 +45,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#getRendererClass()
*/
@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/CellEditorFactory.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/CellEditorFactory.java
new file mode 100644
index 0000000..9229580
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/CellEditorFactory.java
@@ -0,0 +1,169 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.spi.table.swt;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.internal.swt.Activator;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorTester;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.widgets.Composite;
+import org.osgi.framework.Bundle;
+
+/**
+ * Factory to created new {@link ECPCellEditor cell editors}.
+ *
+ * @since 1.10
+ */
+public final class CellEditorFactory {
+ private static final String CONTROL_EXTENSION = "org.eclipse.emf.ecp.edit.swt.cellEditor"; //$NON-NLS-1$
+
+ private static final String CLASS_ATTRIBUTE = "class";//$NON-NLS-1$
+ private static final String ID = "id";//$NON-NLS-1$
+ private static final String TESTER = "tester";//$NON-NLS-1$
+
+ private final Set<CellDescriptor> descriptors = new HashSet<CellEditorFactory.CellDescriptor>();
+ /** CellEditorFactory instance. */
+ public static final CellEditorFactory INSTANCE = new CellEditorFactory();
+
+ private CellEditorFactory() {
+ parseExtensionPoint();
+ }
+
+ private void parseExtensionPoint() {
+ final IConfigurationElement[] controls = Platform.getExtensionRegistry().getConfigurationElementsFor(
+ CONTROL_EXTENSION);
+ for (final IConfigurationElement e : controls) {
+ try {
+ final String id = e.getAttribute(ID);
+ final String clazz = e.getAttribute(CLASS_ATTRIBUTE);
+ final Class<? extends CellEditor> resolvedClass = loadClass(e.getContributor().getName(), clazz);
+ final ECPCellEditorTester tester = (ECPCellEditorTester) e.createExecutableExtension(TESTER);
+ descriptors.add(new CellDescriptor(id, resolvedClass, tester));
+ } catch (final ClassNotFoundException e1) {
+ Activator.logException(e1);
+ } catch (final CoreException e1) {
+ Activator.logException(e1);
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T> Class<T> loadClass(String bundleName, String clazz) throws ClassNotFoundException {
+ final Bundle bundle = Platform.getBundle(bundleName);
+ if (bundle == null) {
+ throw new ClassNotFoundException(
+ // TODO Grid
+ // clazz
+ // + LocalizationServiceHelper.getString(CellEditorFactory.class,
+ // UtilMessageKeys.CellEditorFactory_CannotBeLoadedBecauseBundle)
+ // + bundleName
+ // + LocalizationServiceHelper.getString(CellEditorFactory.class,
+ // UtilMessageKeys.CellEditorFactory_CannotBeResolved)
+ );
+ }
+ return (Class<T>) bundle.loadClass(clazz);
+
+ }
+
+ /**
+ * Returns a new instance of the {@link CellEditor} for the given object.
+ *
+ * @param eStructuralFeature the {@link EStructuralFeature} displayed in the cell editor
+ * @param eObject the {@link EObject}
+ * @param table the parent composite
+ * @param viewModelContext the {@link ViewModelContext} used for the current view
+ * @return the cell editor
+ */
+ @SuppressWarnings("restriction")
+ public CellEditor getCellEditor(EStructuralFeature eStructuralFeature, EObject eObject, Composite table,
+ ViewModelContext viewModelContext) {
+ int bestPriority = -1;
+ CellDescriptor bestCandidate = null;
+ for (final CellDescriptor descriptor : descriptors) {
+ final int priority = descriptor.getTester().isApplicable(eObject, eStructuralFeature, viewModelContext);
+ if (priority > bestPriority) {
+ bestCandidate = descriptor;
+ bestPriority = priority;
+ }
+ }
+ CellEditor result = null;
+ if (bestCandidate != null) {
+ try {
+ final Constructor<? extends CellEditor> constructor = bestCandidate.getCellEditorClass()
+ .getConstructor(
+ Composite.class);
+ result = constructor.newInstance(table);
+ final ECPCellEditor ecpCellEditor = (ECPCellEditor) result;
+ ecpCellEditor.instantiate(eStructuralFeature, viewModelContext);
+ } catch (final SecurityException e) {
+ Activator.logException(e);
+ } catch (final NoSuchMethodException e) {
+ Activator.logException(e);
+ } catch (final IllegalArgumentException e) {
+ Activator.logException(e);
+ } catch (final InstantiationException e) {
+ Activator.logException(e);
+ } catch (final IllegalAccessException e) {
+ Activator.logException(e);
+ } catch (final InvocationTargetException e) {
+ Activator.logException(e);
+ } catch (final ClassCastException e) {
+ Activator.logException(e);
+ }
+ }
+ if (result == null) {
+ result = new TextCellEditor(table);
+ }
+ return result;
+ }
+
+ /**
+ * Descriptor encapsulating the contributions to the <code>org.eclipse.emf.ecp.edit.swt.cellEditor</code> extension
+ * point.
+ */
+ private class CellDescriptor {
+ private final String id;
+ private final Class<? extends CellEditor> cellEditorClass;
+ private final ECPCellEditorTester tester;
+
+ CellDescriptor(String id, Class<? extends CellEditor> cellEditorClass, ECPCellEditorTester tester) {
+ super();
+ this.id = id;
+ this.cellEditorClass = cellEditorClass;
+ this.tester = tester;
+ }
+
+ String getId() {
+ return id;
+ }
+
+ Class<? extends CellEditor> getCellEditorClass() {
+ return cellEditorClass;
+ }
+
+ ECPCellEditorTester getTester() {
+ return tester;
+ }
+ }
+}
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 1480e9c..4a90d86 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
@@ -38,6 +38,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CompoundCommand;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.databinding.EMFDataBindingContext;
import org.eclipse.emf.ecore.EClass;
@@ -46,11 +47,11 @@
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.internal.swt.util.CellEditorFactory;
import org.eclipse.emf.ecp.edit.spi.DeleteService;
import org.eclipse.emf.ecp.edit.spi.EMFDeleteServiceImpl;
import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor;
import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditorComparator;
+import org.eclipse.emf.ecp.edit.spi.swt.table.ECPCustomUpdateCellEditor;
import org.eclipse.emf.ecp.edit.spi.swt.table.ECPElementAwareCellEditor;
import org.eclipse.emf.ecp.edit.spi.swt.util.ECPDialogExecutor;
import org.eclipse.emf.ecp.view.internal.table.swt.CellReadOnlyTesterHelper;
@@ -80,8 +81,12 @@
import org.eclipse.emf.ecp.view.template.style.tableValidation.model.VTTableValidationFactory;
import org.eclipse.emf.ecp.view.template.style.tableValidation.model.VTTableValidationStyleProperty;
import org.eclipse.emf.edit.command.AddCommand;
+import org.eclipse.emf.edit.command.MoveCommand;
import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.spi.common.report.AbstractReport;
import org.eclipse.emfforms.spi.common.report.ReportService;
@@ -98,10 +103,13 @@
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.table.AbstractTableViewerComposite;
import org.eclipse.emfforms.spi.swt.table.ButtonBarBuilder;
import org.eclipse.emfforms.spi.swt.table.CellLabelProviderFactory;
+import org.eclipse.emfforms.spi.swt.table.DNDProvider;
import org.eclipse.emfforms.spi.swt.table.EditingSupportCreator;
-import org.eclipse.emfforms.spi.swt.table.TableViewerComposite;
+import org.eclipse.emfforms.spi.swt.table.TableControl;
+import org.eclipse.emfforms.spi.swt.table.TableViewerComparator;
import org.eclipse.emfforms.spi.swt.table.TableViewerCompositeBuilder;
import org.eclipse.emfforms.spi.swt.table.TableViewerCreator;
import org.eclipse.emfforms.spi.swt.table.TableViewerFactory;
@@ -115,11 +123,14 @@
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.ColumnViewer;
+import org.eclipse.jface.viewers.ColumnViewerEditor;
import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
import org.eclipse.jface.viewers.ColumnViewerEditorActivationListener;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
import org.eclipse.jface.viewers.ColumnViewerEditorDeactivationEvent;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.EditingSupport;
@@ -131,10 +142,17 @@
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerEditor;
+import org.eclipse.jface.viewers.TableViewerFocusCellManager;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DragSourceListener;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.DropTargetListener;
+import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.ControlAdapter;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.SelectionAdapter;
@@ -146,10 +164,12 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.ScrollBar;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Widget;
import org.osgi.framework.FrameworkUtil;
/**
@@ -160,8 +180,14 @@
*
*/
public class TableControlSWTRenderer extends AbstractControlSWTRenderer<VTableControl> {
- private static final String FIXED_COLUMNS = "org.eclipse.rap.rwt.fixedColumns"; //$NON-NLS-1$
- private static final String TABLE_CUSTOM_VARIANT = "org_eclipse_emf_ecp_control_table"; //$NON-NLS-1$
+ /**
+ * @since 1.10
+ */
+ protected static final String FIXED_COLUMNS = "org.eclipse.rap.rwt.fixedColumns"; //$NON-NLS-1$
+ /**
+ * @since 1.10
+ */
+ protected static final String TABLE_CUSTOM_VARIANT = "org_eclipse_emf_ecp_control_table"; //$NON-NLS-1$
private static final String ICON_ADD = "icons/add.png"; //$NON-NLS-1$
private static final String ICON_DELETE = "icons/delete.png"; //$NON-NLS-1$
@@ -174,7 +200,7 @@
private SWTGridDescription rendererGridDescription;
- private TableViewer tableViewer;
+ private AbstractTableViewer tableViewer;
private Label validationIcon;
private Button addButton;
@@ -183,6 +209,9 @@
private Optional<Integer> minimumHeight;
private Optional<Integer> maximumHeight;
private TableControlSWTRendererButtonBarBuilder tableControlSWTRendererButtonBarBuilder;
+ private AbstractTableViewerComposite tableViewerComposite;
+ private int regularColumnsStartIndex;
+ private boolean isDisposing;
/**
* Default constructor.
@@ -224,13 +253,6 @@
return rendererGridDescription;
}
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer#getEMFFormsDatabinding()
- * @since 1.8
- */
@Override
protected EMFFormsDatabindingEMF getEMFFormsDatabinding() {
return (EMFFormsDatabindingEMF) super.getEMFFormsDatabinding();
@@ -259,16 +281,11 @@
/* render */
final TableViewerCompositeBuilder compositeBuilder = new TableControlSWTRendererCompositeBuilder();
tableControlSWTRendererButtonBarBuilder = new TableControlSWTRendererButtonBarBuilder();
- final TableViewerSWTBuilder tableViewerSWTBuilder = TableViewerFactory
- .fillDefaults(parent, SWT.NONE, list, labelText, labelTooltipText)
- .customizeCompositeStructure(compositeBuilder)
- .customizeButtons(tableControlSWTRendererButtonBarBuilder)
- .customizeTableViewerCreation(new TableControlSWTRendererTableViewerCreator())
- .customizeContentProvider(cp)
- .customizeComparator(comparator);
- /* add columns */
- int regularColumnsStartIndex = 0;
+ final TableViewerSWTBuilder tableViewerSWTBuilder = getTableViewerSWTBuilder(parent, list, labelText,
+ labelTooltipText, compositeBuilder, cp, comparator, tableControlSWTRendererButtonBarBuilder);
+
+ regularColumnsStartIndex = 0;
/* validation column */
if (!getVElement().isReadonly()) {
@@ -280,7 +297,7 @@
initCompositeHeight();
- final TableViewerComposite tableViewerComposite = tableViewerSWTBuilder.create();
+ tableViewerComposite = tableViewerSWTBuilder.create();
/* setup selection changes listener */
tableViewerComposite.getTableViewer().addSelectionChangedListener(new ViewerSelectionChangedListener());
@@ -292,6 +309,8 @@
/* get validation icon */
setupValidation(tableViewerComposite);
+ /* create the table viewer editor */
+
setTableViewer(tableViewerComposite.getTableViewer());
SWTDataElementIdHelper.setElementIdDataForVControl(tableViewerComposite, getVElement(),
@@ -304,7 +323,7 @@
addRelayoutListenerIfNeeded(list, compositeBuilder.getViewerComposite());
- addResizeListener(tableViewerComposite.getTableViewer().getTable(), regularColumnsStartIndex);
+ addResizeListener(tableViewerComposite.getTableViewer().getControl(), regularColumnsStartIndex);
return tableViewerComposite;
@@ -317,6 +336,47 @@
}
/**
+ * Creates a new {@link TableViewerSWTBuilder}.
+ *
+ * @param parent the parent {@link Composite}
+ * @param list the input object
+ * @param labelText the title
+ * @param labelTooltipText the tooltip
+ * @param compositeBuilder the {@link TableViewerCompositeBuilder}
+ * @param cp the content provider
+ * @param comparator the {@link ViewerComparator}
+ * @param tableControlSWTRendererButtonBarBuilder2 the {@link ButtonBarBuilder}
+ * @return the {@link TableViewerSWTBuilder}
+ * @since 1.10
+ *
+ */
+ // CHECKSTYLE.OFF: ParameterNumber
+ protected TableViewerSWTBuilder getTableViewerSWTBuilder(Composite parent, IObservableList list,
+ IObservableValue labelText, IObservableValue labelTooltipText, TableViewerCompositeBuilder compositeBuilder,
+ ObservableListContentProvider cp, ECPTableViewerComparator comparator,
+ TableControlSWTRendererButtonBarBuilder tableControlSWTRendererButtonBarBuilder2) {
+ // CHECKSTYLE.ON: ParameterNumber
+ return TableViewerFactory.fillDefaults(parent, SWT.NONE, list, labelText, labelTooltipText)
+ .customizeCompositeStructure(compositeBuilder)
+ .customizeButtons(tableControlSWTRendererButtonBarBuilder)
+ .customizeTableViewerCreation(getTableViewerCreator())
+ .customizeContentProvider(cp)
+ .customizeComparator(comparator)
+ .customizeDragAndDrop(new TableControlSWTRendererDragAndDrop());
+
+ }
+
+ /**
+ * Creates a new instance of the {@link TableViewerCreator} to be used.
+ *
+ * @return the {@link TableViewerCreator}
+ * @since 1.10
+ */
+ protected TableViewerCreator<? extends AbstractTableViewer> getTableViewerCreator() {
+ return new TableControlSWTRendererTableViewerCreator();
+ }
+
+ /**
* Override this method to add additional static columns at the beginning of the table.
*
* @param tableViewerSWTBuilder the builder
@@ -327,29 +387,71 @@
return 0;
}
- private void addResizeListener(final Table table, final int regularColumnsStartIndex) {
+ /**
+ * Returns the zero-relative index of the item which is currently selected in the receiver, or -1 if no item is
+ * selected.
+ *
+ * @return the index of the selected item
+ * @since 1.10
+ */
+ protected int getSelectionIndex() {
+ return ((TableViewer) tableViewer).getTable().getSelectionIndex();
+ }
+
+ /**
+ * Returns an array of {@link Item items} which are the columns in the table.
+ *
+ * @return the columns of the table
+ * @since 1.10
+ */
+ protected Item[] getColumns() {
+ return ((TableViewer) tableViewer).getTable().getColumns();
+ }
+
+ /**
+ * Returns the receiver's horizontal scroll bar if it has one, and null if it does not.
+ *
+ * @return the horizontal scroll bar (or null)
+ * @since 1.10
+ */
+ protected ScrollBar getHorizontalBar() {
+ return ((TableViewer) tableViewer).getTable().getHorizontalBar();
+ }
+
+ /**
+ * Returns the receiver's vertical scroll bar if it has one, and null if it does not.
+ *
+ * @return the vertical scroll bar (or null)
+ * @since 1.10
+ */
+ protected ScrollBar getVerticalBar() {
+ return ((TableViewer) tableViewer).getTable().getVerticalBar();
+ }
+
+ private void addResizeListener(final Control control, final int regularColumnsStartIndex) {
final ControlAdapter controlAdapter = new ControlAdapter() {
@Override
public void controlResized(ControlEvent e) {
- updateTableColumnWidths(table, regularColumnsStartIndex);
+ updateTableColumnWidths(control, regularColumnsStartIndex);
}
};
- table.addControlListener(controlAdapter);
- for (final TableColumn tableColumn : table.getColumns()) {
- tableColumn.addControlListener(controlAdapter);
- }
+ control.addControlListener(controlAdapter);
+
+ tableViewerComposite.addColumnListener(controlAdapter);
}
- private void updateTableColumnWidths(Table table, int regularColumnsStartIndex) {
+ private void updateTableColumnWidths(Control table, int regularColumnsStartIndex) {
+ if (isDisposing) {
+ return;
+ }
final VTableControl tableControl = getVElement();
- final Table swtTable = getTableViewer().getTable();
- final TableColumn[] allColumns = swtTable.getColumns();
+ final Widget[] allColumns = tableViewerComposite.getColumns();
for (int i = regularColumnsStartIndex; i < allColumns.length; i++) {
- final TableColumn tableColumn = allColumns[i];
+ final Widget tableColumn = allColumns[i];
final VDomainModelReference columnDMR = VTableDomainModelReference.class
.cast(tableControl.getDomainModelReference()).getColumnDomainModelReferences()
.get(i - regularColumnsStartIndex);
- TableConfigurationHelper.updateWidthConfiguration(tableControl, columnDMR, swtTable, tableColumn);
+ TableConfigurationHelper.updateWidthConfiguration(tableControl, columnDMR, tableColumn);
}
}
@@ -452,7 +554,7 @@
}
- private void setupValidation(final TableViewerComposite tableViewerComposite) {
+ private void setupValidation(final AbstractTableViewerComposite tableViewerComposite) {
if (tableViewerComposite.getValidationControls().isPresent()) {
final List<Control> validationControls = tableViewerComposite.getValidationControls().get();
if (validationControls.size() == 1 && Label.class.isInstance(validationControls.get(0))) {
@@ -462,13 +564,15 @@
}
private void setupSorting(final ECPTableViewerComparator comparator, int regularColumnsStartIndex,
- final TableViewerComposite tableViewerComposite) {
- for (int i = regularColumnsStartIndex; i < tableViewerComposite.getTableViewer().getTable()
- .getColumns().length; i++) {
- final TableColumn tableColumn = tableViewerComposite.getTableViewer().getTable().getColumns()[i];
- tableColumn.addSelectionListener(getSelectionAdapter(tableViewerComposite.getTableViewer(), comparator,
- tableColumn, i - regularColumnsStartIndex));
+ final AbstractTableViewerComposite tableViewerComposite) {
+ final int length = tableViewerComposite.getColumns().length;
+ final List<Integer> sortableColumns = new ArrayList<Integer>();
+ for (int i = 0; i < length; i++) {
+ if (i >= regularColumnsStartIndex) {
+ sortableColumns.add(i);
+ }
}
+ tableViewerComposite.setComparator(comparator, sortableColumns);
}
private IObservableValue getLabelText(VDomainModelReference dmrToCheck, boolean forColumn) {
@@ -523,8 +627,9 @@
/**
* @return the {@link VDomainModelReference} which ends at the table setting
+ * @since 1.10
*/
- private VDomainModelReference getDMRToMultiReference() {
+ protected final VDomainModelReference getDMRToMultiReference() {
final VTableDomainModelReference tableDomainModelReference = (VTableDomainModelReference) getVElement()
.getDomainModelReference();
final VDomainModelReference dmrToCheck = tableDomainModelReference.getDomainModelReference() == null
@@ -600,7 +705,7 @@
if (tableViewer == null) {
return SWT.DEFAULT;
}
- final Table table = tableViewer.getTable();
+ final TableControl table = tableViewerComposite.getTableControl();
if (table == null) {
return SWT.DEFAULT;
}
@@ -609,7 +714,7 @@
}
final int itemHeight = table.getItemHeight();
// show one empty row if table does not contain any items
- final int itemCount = Math.max(table.getItemCount(), 1);
+ final int itemCount = Math.max(table.getItemHeight(), 1);
final int headerHeight = table.getHeaderVisible() ? table.getHeaderHeight() : 0;
// 4px needed as a buffer to avoid scrollbars
final int tableHeight = itemHeight * itemCount + headerHeight + 4;
@@ -620,8 +725,9 @@
* Returns the table viewer.
*
* @return the viewer
+ * @since 1.10
*/
- protected TableViewer getTableViewer() {
+ protected AbstractTableViewer getTableViewer() {
return tableViewer;
}
@@ -629,8 +735,9 @@
* Sets the table viewer.
*
* @param tableViewer the viewer
+ * @since 1.10
*/
- protected void setTableViewer(TableViewer tableViewer) {
+ protected void setTableViewer(AbstractTableViewer tableViewer) {
this.tableViewer = tableViewer;
}
@@ -667,22 +774,6 @@
}
}
- private SelectionAdapter getSelectionAdapter(final TableViewer tableViewer,
- final ECPTableViewerComparator comparator, final TableColumn column,
- final int index) {
- final SelectionAdapter selectionAdapter = new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- comparator.setColumn(index);
- final int dir = comparator.getDirection();
- tableViewer.getTable().setSortDirection(dir);
- tableViewer.getTable().setSortColumn(column);
- tableViewer.refresh();
- }
- };
- return selectionAdapter;
- }
-
private void createFixedValidationStatusColumn(TableViewerSWTBuilder tableViewerSWTBuilder) {
final VTTableValidationStyleProperty tableValidationStyleProperty = getTableValidationStyleProperty();
final int columnWidth = tableValidationStyleProperty.getColumnWidth();
@@ -752,7 +843,14 @@
return tableValidationProp;
}
- private VTBackgroundStyleProperty getBackgroundStyleProperty() {
+ /**
+ * Returns the {@link VTBackgroundStyleProperty}.
+ *
+ * @return the {@link VTBackgroundStyleProperty}
+ *
+ * @since 1.10
+ */
+ protected VTBackgroundStyleProperty getBackgroundStyleProperty() {
VTBackgroundStyleProperty styleProperty = getStyleProperty(VTBackgroundStyleProperty.class);
if (styleProperty == null) {
styleProperty = getDefaultBackgroundStyleProperty();
@@ -782,7 +880,13 @@
return tableStyleProperty;
}
- private VTFontPropertiesStyleProperty getFontPropertiesStyleProperty() {
+ /**
+ * Returns the {@link VTFontPropertiesStyleProperty}.
+ *
+ * @return the {@link VTFontPropertiesStyleProperty}
+ * @since 1.10
+ */
+ protected VTFontPropertiesStyleProperty getFontPropertiesStyleProperty() {
VTFontPropertiesStyleProperty styleProperty = getStyleProperty(VTFontPropertiesStyleProperty.class);
if (styleProperty == null) {
styleProperty = getDefaultFontPropertiesStyleProperty();
@@ -814,7 +918,15 @@
return null;
}
- private Color getSWTColor(String colorHex) {
+ /**
+ * Returns the {@link Color} specified by the provided String.
+ *
+ * @param colorHex the Hex String describing the color
+ * @return the {@link Color}
+ * @since 1.10
+ *
+ */
+ protected Color getSWTColor(String colorHex) {
final String redString = colorHex.substring(0, 2);
final String greenString = colorHex.substring(2, 4);
final String blueString = colorHex.substring(4, 6);
@@ -831,9 +943,10 @@
* @param feature the feature of the column
* @param table the table/parent
* @return the cell editor
- * @since 1.8
+ * @since 1.10
*/
- protected CellEditor createCellEditor(final EObject tempInstance, final EStructuralFeature feature, Table table) {
+ protected CellEditor createCellEditor(final EObject tempInstance, final EStructuralFeature feature,
+ Composite table) {
return CellEditorFactory.INSTANCE.getCellEditor(feature,
tempInstance, table, getViewModelContext());
}
@@ -978,12 +1091,10 @@
* @since 1.6
*/
protected void addRow(EClass clazz, EObject eObject, EStructuralFeature structuralFeature) {
- final TableControlService tableService = getViewModelContext()
- .getService(TableControlService.class);
Optional<EObject> eObjectToAdd;
/* no table service available, fall back to default */
- if (tableService == null) {
+ if (!getViewModelContext().hasService(TableControlService.class)) {
if (clazz.isAbstract() || clazz.isInterface()) {
getReportService().report(new StatusReport(
new Status(IStatus.WARNING, "org.eclipse.emf.ecp.view.table.ui.swt", //$NON-NLS-1$
@@ -995,6 +1106,8 @@
}
/* table service available */
else {
+ final TableControlService tableService = getViewModelContext()
+ .getService(TableControlService.class);
eObjectToAdd = tableService.createNewElement(clazz, eObject, structuralFeature);
}
@@ -1074,6 +1187,7 @@
*/
@Override
protected void dispose() {
+ isDisposing = true;
rendererGridDescription = null;
viewModelDBC.dispose();
super.dispose();
@@ -1099,6 +1213,8 @@
if (direction == 0) {
return 0;
}
+ // We might have ignored columns at the beginning
+ propertyIndex = propertyIndex - regularColumnsStartIndex;
int rc = 0;
final EObject object1 = (EObject) e1;
final EObject object2 = (EObject) e2;
@@ -1148,6 +1264,168 @@
return rc;
}
+ @Override
+ protected void rootDomainModelChanged() throws DatabindingFailedException {
+ // TODO rebind tooltip and text?
+
+ final IObservableList oldList = (IObservableList) getTableViewer().getInput();
+ oldList.dispose();
+
+ final IObservableList list = getEMFFormsDatabinding().getObservableList(getDMRToMultiReference(),
+ getViewModelContext().getDomainModel());
+ // addRelayoutListenerIfNeeded(list, composite);
+ getTableViewer().setInput(list);
+
+ tableControlSWTRendererButtonBarBuilder.updateValues();
+ }
+
+ /**
+ * The {@link DNDProvider} for this renderer.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+ private final class TableControlSWTRendererDragAndDrop implements DNDProvider {
+
+ /**
+ * The drop adapter.
+ */
+ private final class TableControlDropAdapter extends EditingDomainViewerDropAdapter {
+
+ private final AbstractTableViewer tableViewer;
+ private EObject eObject;
+ private EStructuralFeature eStructuralFeature;
+ private List<Object> list;
+
+ @SuppressWarnings("unchecked")
+ TableControlDropAdapter(EditingDomain domain, Viewer viewer, AbstractTableViewer tableViewer) {
+ super(domain, viewer);
+ this.tableViewer = tableViewer;
+ try {
+ final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
+ getViewModelContext().getDomainModel());
+ eObject = setting.getEObject();
+ eStructuralFeature = setting.getEStructuralFeature();
+ list = (List<Object>) setting.get(true);
+ } catch (final DatabindingFailedException ex) {
+ getReportService().report(new AbstractReport(ex));
+ }
+ }
+
+ @Override
+ protected void helper(DropTargetEvent event) {
+ final Object target = extractDropTarget(event.item);
+ final Collection<?> dragSource = getDragSource(event);
+
+ if (dragSource == null) {
+ /* possible on non-win32 platforms */
+ /* in this case we will just wait until the data is available without setting a detail */
+ return;
+ }
+
+ if (target == null || dragSource.contains(target)) {
+ event.detail = DND.DROP_NONE;
+ return;
+ }
+
+ event.detail = DND.DROP_MOVE;
+ }
+
+ @Override
+ public void drop(DropTargetEvent event) {
+
+ final Collection<?> dragSource = getDragSource(event);
+ final Object target = extractDropTarget(event.item);
+ final float location = getLocation(event);
+
+ final List<Command> commands = new ArrayList<Command>();
+ final boolean insertAfter = location >= 0.5;
+
+ for (final Object toMove : dragSource) {
+ final int indexTarget = list.indexOf(target);
+ final int indexToMove = list.indexOf(toMove);
+
+ if (indexTarget == -1 || indexToMove == -1) {
+ return;
+ }
+
+ final boolean moveIsLocatedBeforeTarget = indexToMove < indexTarget;
+
+ int index;
+ if (insertAfter) {
+ if (moveIsLocatedBeforeTarget) {
+ index = indexTarget;
+ } else {
+ index = indexTarget + 1;
+ }
+ } else {
+ /* insert Before Target */
+ if (moveIsLocatedBeforeTarget) {
+ index = indexTarget - 1;
+ } else {
+ index = indexTarget;
+ }
+ }
+
+ commands.add(MoveCommand.create(domain, eObject, eStructuralFeature, toMove, index));
+ }
+
+ final Command command = new CompoundCommand(commands);
+
+ if (!command.canExecute()) {
+ return;
+ }
+ domain.getCommandStack().execute(command);
+
+ tableViewer.refresh();
+ }
+ }
+
+ @Override
+ public int getDragOperations() {
+ return getDNDOperations();
+ }
+
+ @Override
+ public Transfer[] getDragTransferTypes() {
+ return getDNDTransferTypes();
+ }
+
+ @Override
+ public DragSourceListener getDragListener(AbstractTableViewer tableViewer) {
+ return new ViewerDragAdapter(tableViewer);
+ }
+
+ @Override
+ public int getDropOperations() {
+ return getDNDOperations();
+ }
+
+ @Override
+ public Transfer[] getDropTransferTypes() {
+ return getDNDTransferTypes();
+ }
+
+ @Override
+ public DropTargetListener getDropListener(final AbstractTableViewer tableViewer) {
+ return new TableControlDropAdapter(getEditingDomain(getViewModelContext().getDomainModel()), tableViewer,
+ tableViewer);
+ }
+
+ private int getDNDOperations() {
+ return DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+ }
+
+ private Transfer[] getDNDTransferTypes() {
+ return new Transfer[] { LocalTransfer.getInstance() };
+ }
+
+ @Override
+ public boolean hasDND() {
+ return true;
+ }
+ }
+
/**
* Double click listener.
*
@@ -1155,15 +1433,15 @@
private final class DoubleClickListener implements IDoubleClickListener {
@Override
public void doubleClick(DoubleClickEvent event) {
- final TableControlService tableService = getViewModelContext()
- .getService(TableControlService.class);
- if (tableService == null) {
+ if (!getViewModelContext().hasService(TableControlService.class)) {
return;
}
final ISelection selection = event.getSelection();
if (!StructuredSelection.class.isInstance(selection)) {
return;
}
+ final TableControlService tableService = getViewModelContext()
+ .getService(TableControlService.class);
tableService.doubleClick(getVElement(),
(EObject) StructuredSelection.class.cast(selection).getFirstElement());
}
@@ -1187,6 +1465,9 @@
private final class ApplyValidationRunnable implements Runnable {
@Override
public void run() {
+ if (isDisposing) {
+ return;
+ }
// triggered due to another validation rule before this control is rendered
if (validationIcon == null) {
return;
@@ -1266,16 +1547,16 @@
}
@Override
- public EditingSupport createEditingSupport(TableViewer tableViewer) {
+ public EditingSupport createEditingSupport(AbstractTableViewer tableViewer) {
if (!initialized) {
init(tableViewer);
}
return observableSupport;
}
- private void init(TableViewer tableViewer) {
+ private void init(AbstractTableViewer tableViewer) {
cellEditor = createCellEditor(tempInstance, eStructuralFeature,
- tableViewer.getTable());
+ (Composite) tableViewer.getControl());
if (ECPCellEditorComparator.class.isInstance(cellEditor)) {
columnIndexToComparatorMap.put(indexOfColumn, ECPCellEditorComparator.class.cast(cellEditor));
}
@@ -1285,25 +1566,27 @@
}
@Override
- public CellLabelProvider createCellLabelProvider(TableViewer table) {
+ public CellLabelProvider createCellLabelProvider(AbstractTableViewer table) {
if (!initialized) {
init(table);
}
return new ECPCellLabelProvider(eStructuralFeature, cellEditor, observableMap,
- getVElement(), dmr, table.getTable());
+ getVElement(), dmr, table.getControl());
}
}
/**
- * {@link TableViewerCreator} for the table control swt renderer. It will create a TableViewer with the expected
+ * {@link TableViewerCreator} for the table control swt renderer. It will create a GridTableViewer with the expected
* custom variant data and the correct style properties as defined in the template model.
*
+ * @since 1.10
+ *
*/
- private final class TableControlSWTRendererTableViewerCreator implements TableViewerCreator {
+ protected class TableControlSWTRendererTableViewerCreator implements TableViewerCreator<TableViewer> {
@Override
public TableViewer createTableViewer(Composite parent) {
- tableViewer = new TableViewer(parent,
+ final TableViewer tableViewer = new TableViewer(parent,
SWT.MULTI | SWT.V_SCROLL | SWT.FULL_SELECTION | SWT.BORDER);
tableViewer.getTable().setData(CUSTOM_VARIANT, TABLE_CUSTOM_VARIANT);
tableViewer.getTable().setHeaderVisible(true);
@@ -1323,8 +1606,37 @@
}
tableViewer.getTable().setData(FIXED_COLUMNS, new Integer(1));
+
+ /* manage editing support activation */
+ createTableViewerEditor(tableViewer);
return tableViewer;
}
+
+ /**
+ * This method creates and initialises a {@link TableViewerEditor} for the given {@link TableViewer}.
+ *
+ * @param tableViewer the table viewer
+ */
+ protected void createTableViewerEditor(final TableViewer tableViewer) {
+ final TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(tableViewer,
+ new org.eclipse.emf.ecp.edit.internal.swt.controls.ECPFocusCellDrawHighlighter(tableViewer));
+ final ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(
+ tableViewer) {
+ @Override
+ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+ return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+ || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION
+ || event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR
+ || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
+ }
+ };
+ TableViewerEditor.create(
+ tableViewer,
+ focusCellManager,
+ actSupport,
+ ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
+ | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
+ }
}
/**
@@ -1332,7 +1644,7 @@
* allows subclasses to change the buttons.
*
*/
- private final class TableControlSWTRendererButtonBarBuilder implements ButtonBarBuilder {
+ protected final class TableControlSWTRendererButtonBarBuilder implements ButtonBarBuilder {
private EStructuralFeature structuralFeature;
private EClass clazz;
private EObject eObject;
@@ -1341,6 +1653,11 @@
setValues();
}
+ /**
+ * Reloads the model values.
+ *
+ * @throws DatabindingFailedException if the databinding could not be executed successfully
+ */
public void updateValues() throws DatabindingFailedException {
setValues();
}
@@ -1354,7 +1671,7 @@
}
@Override
- public void fillButtonComposite(Composite buttonComposite, TableViewer viewer) {
+ public void fillButtonComposite(Composite buttonComposite, AbstractTableViewer viewer) {
int numButtons = addButtonsToButtonBar(buttonComposite);
if (!getVElement().isAddRemoveDisabled()) {
addButton = createAddRowButton(
@@ -1370,7 +1687,7 @@
.applyTo(buttonComposite);
}
- private void initButtons(final Button addButton, final Button removeButton, final TableViewer viewer) {
+ private void initButtons(final Button addButton, final Button removeButton, final AbstractTableViewer viewer) {
addButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -1441,18 +1758,21 @@
* none, up and down.
*
* @author Eugen Neufeld
+ * @since 1.10
*
*/
- private class ECPTableViewerComparator extends ViewerComparator {
+ protected class ECPTableViewerComparator extends ViewerComparator implements TableViewerComparator {
private int propertyIndex;
private static final int NONE = 0;
private int direction = NONE;
+ /** Constructs a new instance. */
ECPTableViewerComparator() {
propertyIndex = 0;
direction = NONE;
}
+ @Override
public int getDirection() {
switch (direction) {
case 0:
@@ -1467,6 +1787,7 @@
}
+ @Override
public void setColumn(int column) {
if (column == propertyIndex) {
// Same column as last sort; toggle the direction
@@ -1485,7 +1806,7 @@
}
/**
- * ECP specficic cell label provider that does also implement {@link IColorProvider} in
+ * ECP specific cell label provider that does also implement {@link IColorProvider} in
* order to correctly.
*
* @author emueller
@@ -1497,7 +1818,7 @@
private final CellEditor cellEditor;
private final VTableControl vTableControl;
private final VDomainModelReference dmr;
- private final Table table;
+ private final Control table;
/**
* Constructor.
@@ -1511,10 +1832,10 @@
* @param vTableControl the {@link VTableControl}
* @param dmr the {@link VDomainModelReference} for this cell
* @param table the swt table
- * @since 1.6
+ * @since 1.10
*/
public ECPCellLabelProvider(EStructuralFeature feature, CellEditor cellEditor, IObservableMap attributeMap,
- VTableControl vTableControl, VDomainModelReference dmr, Table table) {
+ VTableControl vTableControl, VDomainModelReference dmr, Control table) {
super(attributeMap);
this.vTableControl = vTableControl;
this.feature = feature;
@@ -1563,8 +1884,9 @@
public void update(ViewerCell cell) {
final EObject element = (EObject) cell.getElement();
final Object value = attributeMaps[0].get(element);
-
- if (ECPCellEditor.class.isInstance(cellEditor)) {
+ if (ECPCustomUpdateCellEditor.class.isInstance(cellEditor)) {
+ ((ECPCustomUpdateCellEditor) cellEditor).updateCell(cell, value);
+ } else if (ECPCellEditor.class.isInstance(cellEditor)) {
final ECPCellEditor ecpCellEditor = (ECPCellEditor) cellEditor;
final String text = ecpCellEditor.getFormatedString(value);
cell.setText(text == null ? "" : text); //$NON-NLS-1$
@@ -1787,10 +2109,9 @@
* cycle.
*/
class EditingState {
+
private final IObservableValue target;
-
private final IObservableValue model;
-
private final Binding binding;
EditingState(Binding binding, IObservableValue target, IObservableValue model) {
@@ -1845,24 +2166,4 @@
return ECPTooltipModifierHelper.modifyString(message, null);
}
}
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer#rootDomainModelChanged()
- */
- @Override
- protected void rootDomainModelChanged() throws DatabindingFailedException {
- // TODO rebind tooltip and text?
-
- final IObservableList oldList = (IObservableList) getTableViewer().getInput();
- oldList.dispose();
-
- final IObservableList list = getEMFFormsDatabinding().getObservableList(getDMRToMultiReference(),
- getViewModelContext().getDomainModel());
- // addRelayoutListenerIfNeeded(list, composite);
- getTableViewer().setInput(list);
-
- tableControlSWTRendererButtonBarBuilder.updateValues();
- }
-}
+}
\ No newline at end of file
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 7020152..e4c7cf9 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: Services
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.validation;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.table.internal.validation.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 2a39b8b..5b493b3 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.validation/src/org/eclipse/emf/ecp/view/table/internal/validation/TableValidationInitiator.java b/bundles/org.eclipse.emf.ecp.view.table.validation/src/org/eclipse/emf/ecp/view/table/internal/validation/TableValidationInitiator.java
index 3f23a95..dd04e61 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.validation/src/org/eclipse/emf/ecp/view/table/internal/validation/TableValidationInitiator.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.validation/src/org/eclipse/emf/ecp/view/table/internal/validation/TableValidationInitiator.java
@@ -89,14 +89,9 @@
if (tableContextMapping == null) {
return;
}
- for (final EObject newValue : notification.getNewEObjects()) {
- try {
- tableContextMapping.context.getChildContext(newValue,
- tableContextMapping.control, getView(tableContextMapping.control));
- } catch (final DatabindingFailedException ex) {
- Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
- }
- }
+ checkAdditions(notification, tableContextMapping);
+
+ checkRemovals(notification, tableContextMapping);
}
});
checkForTables(context);
@@ -194,7 +189,7 @@
@Override
public int getPriority() {
- return 2;
+ return 1;
}
/**
@@ -205,6 +200,7 @@
@Override
public void childViewModelContextAdded(ViewModelContext childContext) {
checkForTables(childContext);
+ childContext.registerEMFFormsContextListener(this);
}
/**
@@ -217,6 +213,7 @@
public void childContextAdded(VElement parentElement, EMFFormsViewContext childContext) {
if (ViewModelContext.class.isInstance(childContext)) {
checkForTables(ViewModelContext.class.cast(childContext));
+ childContext.registerEMFFormsContextListener(this);
}
}
@@ -250,4 +247,28 @@
// intentionally left empty
}
+ private void checkAdditions(ModelChangeNotification notification, final TableContextMapping tableContextMapping) {
+ for (final EObject newValue : notification.getNewEObjects()) {
+ try {
+ final ViewModelContext vmc = tableContextMapping.context.getChildContext(newValue,
+ tableContextMapping.control, getView(tableContextMapping.control));
+ vmc.addContextUser(this);
+ } catch (final DatabindingFailedException ex) {
+ Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+ }
+ }
+ }
+
+ private void checkRemovals(ModelChangeNotification notification, final TableContextMapping tableContextMapping) {
+ for (final EObject oldValue : notification.getOldEObjects()) {
+ try {
+ final ViewModelContext vmc = tableContextMapping.context.getChildContext(oldValue,
+ tableContextMapping.control, getView(tableContextMapping.control));
+ vmc.removeContextUser(this);
+ } catch (final DatabindingFailedException ex) {
+ Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
+ }
+ }
+ }
+
}
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 8c53911..4b250bf 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/plugin.properties b/bundles/org.eclipse.emf.ecp.view.template.model.edit/plugin.properties
index 8c7a24b..5197591 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
@@ -203,3 +203,18 @@
_UI_TableStyleProperty_type = Table Style Property
_UI_TableStyleProperty_minimumHeight_feature = Minimum Height
_UI_TableStyleProperty_maximumHeight_feature = Maximum Height
+_UI_ValidationStyleProperty_okForegroundColorHEX_feature = Ok Foreground Color HEX
+_UI_ValidationStyleProperty_infoForegroundColorHEX_feature = Info Foreground Color HEX
+_UI_ValidationStyleProperty_warningForegroundColorHEX_feature = Warning Foreground Color HEX
+_UI_ValidationStyleProperty_errorForegroundColorHEX_feature = Error Foreground Color HEX
+_UI_ValidationStyleProperty_cancelForegroundColorHEX_feature = Cancel Foreground Color HEX
+_UI_ControlValidationTemplate_okForegroundColorHEX_feature = Ok Foreground Color HEX
+_UI_ControlValidationTemplate_infoForegroundColorHEX_feature = Info Foreground Color HEX
+_UI_ControlValidationTemplate_warningForegroundColorHEX_feature = Warning Foreground Color HEX
+_UI_ControlValidationTemplate_errorForegroundColorHEX_feature = Error Foreground Color HEX
+_UI_ControlValidationTemplate_cancelForegroundColorHEX_feature = Cancel Foreground Color HEX
+_UI_TabStyleProperty_okImageURL_feature = Ok Image URL
+_UI_TabStyleProperty_infoImageURL_feature = Info Image URL
+_UI_TabStyleProperty_warningImageURL_feature = Warning Image URL
+_UI_TabStyleProperty_errorImageURL_feature = Error Image URL
+_UI_TabStyleProperty_cancelImageURL_feature = Cancel Image URL
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 a2244b2..d3e33ae 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/model/provider/ControlValidationTemplateItemProvider.java b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/model/provider/ControlValidationTemplateItemProvider.java
index 01a3a7b..23d5887 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/model/provider/ControlValidationTemplateItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/model/provider/ControlValidationTemplateItemProvider.java
@@ -75,18 +75,23 @@
super.getPropertyDescriptors(object);
addOkColorHEXPropertyDescriptor(object);
+ addOkForegroundColorHEXPropertyDescriptor(object);
addOkImageURLPropertyDescriptor(object);
addOkOverlayURLPropertyDescriptor(object);
addInfoColorHEXPropertyDescriptor(object);
+ addInfoForegroundColorHEXPropertyDescriptor(object);
addInfoImageURLPropertyDescriptor(object);
addInfoOverlayURLPropertyDescriptor(object);
addWarningColorHEXPropertyDescriptor(object);
+ addWarningForegroundColorHEXPropertyDescriptor(object);
addWarningImageURLPropertyDescriptor(object);
addWarningOverlayURLPropertyDescriptor(object);
addErrorColorHEXPropertyDescriptor(object);
+ addErrorForegroundColorHEXPropertyDescriptor(object);
addErrorImageURLPropertyDescriptor(object);
addErrorOverlayURLPropertyDescriptor(object);
addCancelColorHEXPropertyDescriptor(object);
+ addCancelForegroundColorHEXPropertyDescriptor(object);
addCancelImageURLPropertyDescriptor(object);
addCancelOverlayURLPropertyDescriptor(object);
}
@@ -120,6 +125,30 @@
}
/**
+ * This adds a property descriptor for the Ok Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addOkForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(
+ ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ControlValidationTemplate_okForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_okForegroundColorHEX_feature", "_UI_ControlValidationTemplate_type"), //$NON-NLS-1$ //$NON-NLS-2$
+ VTTemplatePackage.Literals.CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Ok Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -198,6 +227,30 @@
}
/**
+ * This adds a property descriptor for the Info Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addInfoForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ControlValidationTemplate_infoForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_infoForegroundColorHEX_feature", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_type"), //$NON-NLS-1$
+ VTTemplatePackage.Literals.CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Info Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -276,6 +329,30 @@
}
/**
+ * This adds a property descriptor for the Warning Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addWarningForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ControlValidationTemplate_warningForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_warningForegroundColorHEX_feature", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_type"), //$NON-NLS-1$
+ VTTemplatePackage.Literals.CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Warning Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -354,6 +431,30 @@
}
/**
+ * This adds a property descriptor for the Error Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addErrorForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ControlValidationTemplate_errorForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_errorForegroundColorHEX_feature", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_type"), //$NON-NLS-1$
+ VTTemplatePackage.Literals.CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Error Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -432,6 +533,30 @@
}
/**
+ * This adds a property descriptor for the Cancel Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addCancelForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ControlValidationTemplate_cancelForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_cancelForegroundColorHEX_feature", //$NON-NLS-1$
+ "_UI_ControlValidationTemplate_type"), //$NON-NLS-1$
+ VTTemplatePackage.Literals.CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Cancel Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -528,18 +653,23 @@
switch (notification.getFeatureID(VTControlValidationTemplate.class))
{
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX:
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_OVERLAY_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX:
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_OVERLAY_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX:
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_OVERLAY_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX:
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_OVERLAY_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX:
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL:
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_OVERLAY_URL:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tab/model/provider/TabStylePropertyItemProvider.java b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tab/model/provider/TabStylePropertyItemProvider.java
index 111608b..cdce7c1 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tab/model/provider/TabStylePropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tab/model/provider/TabStylePropertyItemProvider.java
@@ -72,6 +72,11 @@
super.getPropertyDescriptors(object);
addTypePropertyDescriptor(object);
+ addOkImageURLPropertyDescriptor(object);
+ addInfoImageURLPropertyDescriptor(object);
+ addWarningImageURLPropertyDescriptor(object);
+ addErrorImageURLPropertyDescriptor(object);
+ addCancelImageURLPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -100,6 +105,121 @@
}
/**
+ * This adds a property descriptor for the Ok Image URL feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addOkImageURLPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TabStyleProperty_okImageURL_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TabStyleProperty_okImageURL_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TabStyleProperty_type"), //$NON-NLS-1$
+ VTTabPackage.Literals.TAB_STYLE_PROPERTY__OK_IMAGE_URL,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Info Image URL feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addInfoImageURLPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TabStyleProperty_infoImageURL_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TabStyleProperty_infoImageURL_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TabStyleProperty_type"), //$NON-NLS-1$
+ VTTabPackage.Literals.TAB_STYLE_PROPERTY__INFO_IMAGE_URL,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Warning Image URL feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addWarningImageURLPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TabStyleProperty_warningImageURL_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TabStyleProperty_warningImageURL_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TabStyleProperty_type"), //$NON-NLS-1$
+ VTTabPackage.Literals.TAB_STYLE_PROPERTY__WARNING_IMAGE_URL,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Error Image URL feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addErrorImageURLPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TabStyleProperty_errorImageURL_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TabStyleProperty_errorImageURL_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TabStyleProperty_type"), //$NON-NLS-1$
+ VTTabPackage.Literals.TAB_STYLE_PROPERTY__ERROR_IMAGE_URL,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Cancel Image URL feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addCancelImageURLPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TabStyleProperty_cancelImageURL_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TabStyleProperty_cancelImageURL_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TabStyleProperty_type"), //$NON-NLS-1$
+ VTTabPackage.Literals.TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This returns TabStyleProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -122,8 +242,8 @@
public String getText(Object object) {
final TabType labelValue = ((VTTabStyleProperty) object).getType();
final String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ? getString("_UI_TabStyleProperty_type") //$NON-NLS-1$
- : getString("_UI_TabStyleProperty_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ return label == null || label.length() == 0 ? getString("_UI_TabStyleProperty_type") : //$NON-NLS-1$
+ getString("_UI_TabStyleProperty_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -140,6 +260,11 @@
switch (notification.getFeatureID(VTTabStyleProperty.class)) {
case VTTabPackage.TAB_STYLE_PROPERTY__TYPE:
+ case VTTabPackage.TAB_STYLE_PROPERTY__OK_IMAGE_URL:
+ case VTTabPackage.TAB_STYLE_PROPERTY__INFO_IMAGE_URL:
+ case VTTabPackage.TAB_STYLE_PROPERTY__WARNING_IMAGE_URL:
+ case VTTabPackage.TAB_STYLE_PROPERTY__ERROR_IMAGE_URL:
+ case VTTabPackage.TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/validation/model/provider/ValidationStylePropertyItemProvider.java b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/validation/model/provider/ValidationStylePropertyItemProvider.java
index 0e04dcd..8a38228 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/validation/model/provider/ValidationStylePropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/validation/model/provider/ValidationStylePropertyItemProvider.java
@@ -75,18 +75,23 @@
super.getPropertyDescriptors(object);
addOkColorHEXPropertyDescriptor(object);
+ addOkForegroundColorHEXPropertyDescriptor(object);
addOkImageURLPropertyDescriptor(object);
addOkOverlayURLPropertyDescriptor(object);
addInfoColorHEXPropertyDescriptor(object);
+ addInfoForegroundColorHEXPropertyDescriptor(object);
addInfoImageURLPropertyDescriptor(object);
addInfoOverlayURLPropertyDescriptor(object);
addWarningColorHEXPropertyDescriptor(object);
+ addWarningForegroundColorHEXPropertyDescriptor(object);
addWarningImageURLPropertyDescriptor(object);
addWarningOverlayURLPropertyDescriptor(object);
addErrorColorHEXPropertyDescriptor(object);
+ addErrorForegroundColorHEXPropertyDescriptor(object);
addErrorImageURLPropertyDescriptor(object);
addErrorOverlayURLPropertyDescriptor(object);
addCancelColorHEXPropertyDescriptor(object);
+ addCancelForegroundColorHEXPropertyDescriptor(object);
addCancelImageURLPropertyDescriptor(object);
addCancelOverlayURLPropertyDescriptor(object);
}
@@ -120,6 +125,29 @@
}
/**
+ * This adds a property descriptor for the Ok Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addOkForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ValidationStyleProperty_okForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ValidationStyleProperty_okForegroundColorHEX_feature", "_UI_ValidationStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$
+ VTValidationPackage.Literals.VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Ok Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -198,6 +226,29 @@
}
/**
+ * This adds a property descriptor for the Info Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addInfoForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ValidationStyleProperty_infoForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ValidationStyleProperty_infoForegroundColorHEX_feature", "_UI_ValidationStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$
+ VTValidationPackage.Literals.VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Info Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -276,6 +327,30 @@
}
/**
+ * This adds a property descriptor for the Warning Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addWarningForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ValidationStyleProperty_warningForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ValidationStyleProperty_warningForegroundColorHEX_feature", //$NON-NLS-1$
+ "_UI_ValidationStyleProperty_type"), //$NON-NLS-1$
+ VTValidationPackage.Literals.VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Warning Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -354,6 +429,29 @@
}
/**
+ * This adds a property descriptor for the Error Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addErrorForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ValidationStyleProperty_errorForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ValidationStyleProperty_errorForegroundColorHEX_feature", "_UI_ValidationStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$
+ VTValidationPackage.Literals.VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Error Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -432,6 +530,29 @@
}
/**
+ * This adds a property descriptor for the Cancel Foreground Color HEX feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addCancelForegroundColorHEXPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ValidationStyleProperty_cancelForegroundColorHEX_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_ValidationStyleProperty_cancelForegroundColorHEX_feature", "_UI_ValidationStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$
+ VTValidationPackage.Literals.VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Cancel Image URL feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -528,18 +649,23 @@
switch (notification.getFeatureID(VTValidationStyleProperty.class))
{
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX:
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_OVERLAY_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX:
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_OVERLAY_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX:
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_OVERLAY_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX:
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_OVERLAY_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX:
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL:
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_OVERLAY_URL:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
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 1f2156e..ce8de43 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
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.ecp.view.template.model" version="2">
<resource path="META-INF/MANIFEST.MF">
+ <filter comment="spi change" id="923795461">
+ <message_arguments>
+ <message_argument value="1.10.0"/>
+ <message_argument value="1.9.0"/>
+ </message_arguments>
+ </filter>
<filter comment="SPI Change in 1.6" id="923795461">
<message_arguments>
<message_argument value="1.6.0"/>
@@ -32,4 +38,689 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/model/VTControlValidationTemplate.java" type="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate">
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="getCancelForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="getErrorForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="getInfoForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="getOkForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="getWarningForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="setCancelForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="setErrorForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="setInfoForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="setOkForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate"/>
+ <message_argument value="setWarningForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/model/VTTemplatePackage.java" type="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage">
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE_FEATURE_COUNT"/>
+ <message_argument value="15"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX"/>
+ <message_argument value="12"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL"/>
+ <message_argument value="13"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__CANCEL_OVERLAY_URL"/>
+ <message_argument value="14"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX"/>
+ <message_argument value="9"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL"/>
+ <message_argument value="10"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__ERROR_OVERLAY_URL"/>
+ <message_argument value="11"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX"/>
+ <message_argument value="3"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL"/>
+ <message_argument value="4"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__INFO_OVERLAY_URL"/>
+ <message_argument value="5"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL"/>
+ <message_argument value="1"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__OK_OVERLAY_URL"/>
+ <message_argument value="2"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX"/>
+ <message_argument value="6"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL"/>
+ <message_argument value="7"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__WARNING_OVERLAY_URL"/>
+ <message_argument value="8"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="getControlValidationTemplate_CancelForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="getControlValidationTemplate_ErrorForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="getControlValidationTemplate_InfoForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="getControlValidationTemplate_OkForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage"/>
+ <message_argument value="getControlValidationTemplate_WarningForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/model/VTTemplatePackage.java" type="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage$Literals">
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage.Literals"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage.Literals"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage.Literals"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage.Literals"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.model.VTTemplatePackage.Literals"/>
+ <message_argument value="CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabPackage.java" type="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage">
+ <filter comment="SPI change 1.10.0" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="TAB_STYLE_PROPERTY_FEATURE_COUNT"/>
+ <message_argument value="1"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="TAB_STYLE_PROPERTY__ERROR_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="TAB_STYLE_PROPERTY__INFO_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="TAB_STYLE_PROPERTY__OK_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="TAB_STYLE_PROPERTY__WARNING_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="getTabStyleProperty_CancelImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="getTabStyleProperty_ErrorImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="getTabStyleProperty_InfoImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="getTabStyleProperty_OkImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage"/>
+ <message_argument value="getTabStyleProperty_WarningImageURL()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabPackage.java" type="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage$Literals">
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage.Literals"/>
+ <message_argument value="TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage.Literals"/>
+ <message_argument value="TAB_STYLE_PROPERTY__ERROR_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage.Literals"/>
+ <message_argument value="TAB_STYLE_PROPERTY__INFO_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage.Literals"/>
+ <message_argument value="TAB_STYLE_PROPERTY__OK_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change 1.10.0" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage.Literals"/>
+ <message_argument value="TAB_STYLE_PROPERTY__WARNING_IMAGE_URL"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabStyleProperty.java" type="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty">
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="getCancelImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="getErrorImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="getInfoImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="getOkImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="getWarningImageURL()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="setCancelImageURL(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="setErrorImageURL(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="setInfoImageURL(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="setOkImageURL(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty"/>
+ <message_argument value="setWarningImageURL(String)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationPackage.java" type="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage">
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY_FEATURE_COUNT"/>
+ <message_argument value="15"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX"/>
+ <message_argument value="12"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL"/>
+ <message_argument value="13"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__CANCEL_OVERLAY_URL"/>
+ <message_argument value="14"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX"/>
+ <message_argument value="9"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL"/>
+ <message_argument value="10"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__ERROR_OVERLAY_URL"/>
+ <message_argument value="11"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX"/>
+ <message_argument value="3"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL"/>
+ <message_argument value="4"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__INFO_OVERLAY_URL"/>
+ <message_argument value="5"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL"/>
+ <message_argument value="1"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__OK_OVERLAY_URL"/>
+ <message_argument value="2"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX"/>
+ <message_argument value="6"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL"/>
+ <message_argument value="7"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__WARNING_OVERLAY_URL"/>
+ <message_argument value="8"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="getValidationStyleProperty_CancelForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="getValidationStyleProperty_ErrorForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="getValidationStyleProperty_InfoForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="getValidationStyleProperty_OkForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage"/>
+ <message_argument value="getValidationStyleProperty_WarningForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationPackage.java" type="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage$Literals">
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage.Literals"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage.Literals"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage.Literals"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage.Literals"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage.Literals"/>
+ <message_argument value="VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationStyleProperty.java" type="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty">
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="getCancelForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="getErrorForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="getInfoForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="getOkForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="getWarningForegroundColorHEX()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="setCancelForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="setErrorForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="setInfoForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="setOkForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="spi change" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty"/>
+ <message_argument value="setWarningForegroundColorHEX(String)"/>
+ </message_arguments>
+ </filter>
+ </resource>
</component>
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 426b4ba..e4474d0 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,53 +2,53 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.background.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tab.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
+Export-Package: org.eclipse.emf.ecp.internal.view.template.model;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.background.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tab.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/tabStyle.ecore b/bundles/org.eclipse.emf.ecp.view.template.model/model/tabStyle.ecore
index 21676bb..4f97cd9 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/tabStyle.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/tabStyle.ecore
@@ -5,6 +5,11 @@
<eClassifiers xsi:type="ecore:EClass" name="TabStyleProperty" eSuperTypes="template.ecore#//StyleProperty">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type" lowerBound="1" eType="#//TabType"
defaultValueLiteral="BOTTOM"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="TabType">
<eLiterals name="BOTTOM"/>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/template.ecore b/bundles/org.eclipse.emf.ecp.view.template.model/model/template.ecore
index e864073..090e8f5 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/template.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/template.ecore
@@ -1,38 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="template" nsURI="http://org/eclipse/emf/ecp/view/template/model"
- nsPrefix="org.eclipse.emf.ecp.view.template.model">
- <eClassifiers xsi:type="ecore:EClass" name="ViewTemplate">
- <eStructuralFeatures xsi:type="ecore:EReference" name="controlValidationConfiguration"
- lowerBound="1" eType="#//ControlValidationTemplate" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="styles" upperBound="-1"
- eType="#//Style" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedEcores" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ControlValidationTemplate">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="okColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="okImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="okOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Style">
- <eStructuralFeatures xsi:type="ecore:EReference" name="selector" lowerBound="1"
- eType="#//StyleSelector" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
- eType="#//StyleProperty" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="StyleProperty" abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="StyleSelector" abstract="true" interface="true"/>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="template" nsURI="http://org/eclipse/emf/ecp/view/template/model"
+ nsPrefix="org.eclipse.emf.ecp.view.template.model">
+ <eClassifiers xsi:type="ecore:EClass" name="ViewTemplate">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="controlValidationConfiguration"
+ lowerBound="1" eType="#//ControlValidationTemplate" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="styles" upperBound="-1"
+ eType="#//Style" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedEcores" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ControlValidationTemplate">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okForegroundColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Style">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="selector" lowerBound="1"
+ eType="#//StyleSelector" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
+ eType="#//StyleProperty" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StyleProperty" abstract="true" interface="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="StyleSelector" abstract="true" interface="true"/>
+</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/validationStyle.ecore b/bundles/org.eclipse.emf.ecp.view.template.model/model/validationStyle.ecore
index 3b1477d..09247a6 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/validationStyle.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/validationStyle.ecore
@@ -1,22 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="validation" nsURI="http://www.eclipse.org/emf/ecp/view/template/style/validation/model"
- nsPrefix="org.eclipse.emf.ecp.view.template.style.validation.model">
- <eClassifiers xsi:type="ecore:EClass" name="ValidationStyleProperty" eSuperTypes="template.ecore#//StyleProperty">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="okColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="okImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="okOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="validation" nsURI="http://www.eclipse.org/emf/ecp/view/template/style/validation/model"
+ nsPrefix="org.eclipse.emf.ecp.view.template.style.validation.model">
+ <eClassifiers xsi:type="ecore:EClass" name="ValidationStyleProperty" eSuperTypes="template.ecore#//StyleProperty">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okForegroundColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="okOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="infoOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="warningOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="errorOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelColorHEX" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelForegroundColorHEX"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelImageURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cancelOverlayURL" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore b/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore
index 4bec29b..184a70f 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/viewModelElementSelector.ecore
@@ -4,8 +4,8 @@
nsPrefix="org.eclipse.emf.ecp.view.template.selector.viewmodelelement.model">
<eClassifiers xsi:type="ecore:EClass" name="ViewModelElementSelector" eSuperTypes="template.ecore#//StyleSelector">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="selectSubclasses" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="classType" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="classType" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="attributeValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.model/pom.xml
index c8aefa0..03fefca 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTControlValidationTemplate.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTControlValidationTemplate.java
index eb42a83..df40a10 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTControlValidationTemplate.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTControlValidationTemplate.java
@@ -21,34 +21,46 @@
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkColorHEX <em>Ok Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkImageURL <em>Ok Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkOverlayURL <em>Ok Overlay URL
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoColorHEX <em>Info Color HEX
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoImageURL <em>Info Image URL
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoOverlayURL <em>Info Overlay URL
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningColorHEX <em>Warning Color
- * HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningImageURL <em>Warning Image
- * URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningOverlayURL <em>Warning
- * Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorColorHEX <em>Error Color HEX
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorImageURL <em>Error Image URL
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorOverlayURL <em>Error Overlay
- * URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelColorHEX <em>Cancel Color HEX
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelImageURL <em>Cancel Image URL
- * </em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelOverlayURL <em>Cancel Overlay
- * URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkColorHEX <em>Ok Color HEX</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkImageURL <em>Ok Image URL</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkOverlayURL
+ * <em>Ok Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoColorHEX
+ * <em>Info Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoImageURL
+ * <em>Info Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoOverlayURL
+ * <em>Info Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningColorHEX
+ * <em>Warning Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningImageURL
+ * <em>Warning Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningOverlayURL
+ * <em>Warning Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorColorHEX
+ * <em>Error Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorImageURL
+ * <em>Error Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorOverlayURL
+ * <em>Error Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelColorHEX
+ * <em>Cancel Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelImageURL
+ * <em>Cancel Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelOverlayURL
+ * <em>Cancel Overlay URL</em>}</li>
* </ul>
* </p>
*
@@ -56,8 +68,7 @@
* @model
* @generated
*/
-public interface VTControlValidationTemplate extends EObject
-{
+public interface VTControlValidationTemplate extends EObject {
/**
* Returns the value of the '<em><b>Ok Color HEX</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -88,6 +99,40 @@
void setOkColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Ok Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Ok Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Ok Foreground Color HEX</em>' attribute.
+ * @see #setOkForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.model.VTTemplatePackage#getControlValidationTemplate_OkForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getOkForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Ok Foreground Color HEX</em>' attribute.
+ * @see #getOkForegroundColorHEX()
+ * @generated
+ */
+ void setOkForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Ok Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -177,6 +222,40 @@
void setInfoColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Info Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Info Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Info Foreground Color HEX</em>' attribute.
+ * @see #setInfoForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.model.VTTemplatePackage#getControlValidationTemplate_InfoForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getInfoForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Info Foreground Color HEX</em>' attribute.
+ * @see #getInfoForegroundColorHEX()
+ * @generated
+ */
+ void setInfoForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Info Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -267,6 +346,40 @@
void setWarningColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Warning Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Warning Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Warning Foreground Color HEX</em>' attribute.
+ * @see #setWarningForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.model.VTTemplatePackage#getControlValidationTemplate_WarningForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getWarningForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Warning Foreground Color HEX</em>' attribute.
+ * @see #getWarningForegroundColorHEX()
+ * @generated
+ */
+ void setWarningForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Warning Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -357,6 +470,40 @@
void setErrorColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Error Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Error Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Error Foreground Color HEX</em>' attribute.
+ * @see #setErrorForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.model.VTTemplatePackage#getControlValidationTemplate_ErrorForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getErrorForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Error Foreground Color HEX</em>' attribute.
+ * @see #getErrorForegroundColorHEX()
+ * @generated
+ */
+ void setErrorForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Error Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -447,6 +594,40 @@
void setCancelColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Cancel Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Cancel Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Cancel Foreground Color HEX</em>' attribute.
+ * @see #setCancelForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.model.VTTemplatePackage#getControlValidationTemplate_CancelForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getCancelForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Cancel Foreground Color HEX</em>' attribute.
+ * @see #getCancelForegroundColorHEX()
+ * @generated
+ */
+ void setCancelForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Cancel Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTTemplatePackage.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTTemplatePackage.java
index 247df05..727af0b 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTTemplatePackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/VTTemplatePackage.java
@@ -33,8 +33,7 @@
* @model kind="package"
* @generated
*/
-public interface VTTemplatePackage extends EPackage
-{
+public interface VTTemplatePackage extends EPackage {
/**
* The package name.
* <!-- begin-user-doc -->
@@ -156,6 +155,18 @@
int CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX = 0;
/**
+ * The feature id for the '<em><b>Ok Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX = 1;
+
+ /**
* The feature id for the '<em><b>Ok Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -163,7 +174,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL = 1;
+ int CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL = 2;
/**
* The feature id for the '<em><b>Ok Overlay URL</b></em>' attribute.
@@ -173,7 +184,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__OK_OVERLAY_URL = 2;
+ int CONTROL_VALIDATION_TEMPLATE__OK_OVERLAY_URL = 3;
/**
* The feature id for the '<em><b>Info Color HEX</b></em>' attribute.
@@ -183,7 +194,19 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX = 3;
+ int CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX = 4;
+
+ /**
+ * The feature id for the '<em><b>Info Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX = 5;
/**
* The feature id for the '<em><b>Info Image URL</b></em>' attribute.
@@ -193,7 +216,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL = 4;
+ int CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL = 6;
/**
* The feature id for the '<em><b>Info Overlay URL</b></em>' attribute.
@@ -203,7 +226,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__INFO_OVERLAY_URL = 5;
+ int CONTROL_VALIDATION_TEMPLATE__INFO_OVERLAY_URL = 7;
/**
* The feature id for the '<em><b>Warning Color HEX</b></em>' attribute.
@@ -213,7 +236,19 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX = 6;
+ int CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX = 8;
+
+ /**
+ * The feature id for the '<em><b>Warning Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX = 9;
/**
* The feature id for the '<em><b>Warning Image URL</b></em>' attribute.
@@ -223,7 +258,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL = 7;
+ int CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL = 10;
/**
* The feature id for the '<em><b>Warning Overlay URL</b></em>' attribute.
@@ -233,7 +268,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__WARNING_OVERLAY_URL = 8;
+ int CONTROL_VALIDATION_TEMPLATE__WARNING_OVERLAY_URL = 11;
/**
* The feature id for the '<em><b>Error Color HEX</b></em>' attribute.
@@ -243,7 +278,19 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX = 9;
+ int CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX = 12;
+
+ /**
+ * The feature id for the '<em><b>Error Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX = 13;
/**
* The feature id for the '<em><b>Error Image URL</b></em>' attribute.
@@ -253,7 +300,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL = 10;
+ int CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL = 14;
/**
* The feature id for the '<em><b>Error Overlay URL</b></em>' attribute.
@@ -263,7 +310,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__ERROR_OVERLAY_URL = 11;
+ int CONTROL_VALIDATION_TEMPLATE__ERROR_OVERLAY_URL = 15;
/**
* The feature id for the '<em><b>Cancel Color HEX</b></em>' attribute.
@@ -273,7 +320,19 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX = 12;
+ int CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX = 16;
+
+ /**
+ * The feature id for the '<em><b>Cancel Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX = 17;
/**
* The feature id for the '<em><b>Cancel Image URL</b></em>' attribute.
@@ -283,7 +342,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL = 13;
+ int CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL = 18;
/**
* The feature id for the '<em><b>Cancel Overlay URL</b></em>' attribute.
@@ -293,7 +352,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE__CANCEL_OVERLAY_URL = 14;
+ int CONTROL_VALIDATION_TEMPLATE__CANCEL_OVERLAY_URL = 19;
/**
* The number of structural features of the '<em>Control Validation Template</em>' class.
@@ -303,7 +362,7 @@
* @generated
* @ordered
*/
- int CONTROL_VALIDATION_TEMPLATE_FEATURE_COUNT = 15;
+ int CONTROL_VALIDATION_TEMPLATE_FEATURE_COUNT = 20;
/**
* The number of operations of the '<em>Control Validation Template</em>' class.
@@ -510,6 +569,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Ok Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkForegroundColorHEX()
+ * @see #getControlValidationTemplate()
+ * @generated
+ */
+ EAttribute getControlValidationTemplate_OkForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getOkImageURL <em>Ok Image URL</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -551,6 +626,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Info Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoForegroundColorHEX()
+ * @see #getControlValidationTemplate()
+ * @generated
+ */
+ EAttribute getControlValidationTemplate_InfoForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getInfoImageURL
* <em>Info Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -593,6 +684,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Warning Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningForegroundColorHEX()
+ * @see #getControlValidationTemplate()
+ * @generated
+ */
+ EAttribute getControlValidationTemplate_WarningForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getWarningImageURL
* <em>Warning Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -635,6 +742,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Error Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorForegroundColorHEX()
+ * @see #getControlValidationTemplate()
+ * @generated
+ */
+ EAttribute getControlValidationTemplate_ErrorForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getErrorImageURL
* <em>Error Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -677,6 +800,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Cancel Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelForegroundColorHEX()
+ * @see #getControlValidationTemplate()
+ * @generated
+ */
+ EAttribute getControlValidationTemplate_CancelForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.model.VTControlValidationTemplate#getCancelImageURL
* <em>Cancel Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -788,8 +927,7 @@
*
* @generated
*/
- interface Literals
- {
+ interface Literals {
/**
* The meta object literal for the '{@link org.eclipse.emf.ecp.view.template.model.impl.VTViewTemplateImpl
* <em>View Template</em>}' class.
@@ -854,6 +992,18 @@
EAttribute CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX = eINSTANCE.getControlValidationTemplate_OkColorHEX();
/**
+ * The meta object literal for the '<em><b>Ok Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getControlValidationTemplate_OkForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Ok Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -881,6 +1031,18 @@
EAttribute CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX = eINSTANCE.getControlValidationTemplate_InfoColorHEX();
/**
+ * The meta object literal for the '<em><b>Info Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getControlValidationTemplate_InfoForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Info Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -910,6 +1072,18 @@
.getControlValidationTemplate_WarningColorHEX();
/**
+ * The meta object literal for the '<em><b>Warning Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getControlValidationTemplate_WarningForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Warning Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -940,6 +1114,18 @@
.getControlValidationTemplate_ErrorColorHEX();
/**
+ * The meta object literal for the '<em><b>Error Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getControlValidationTemplate_ErrorForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Error Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -970,6 +1156,18 @@
.getControlValidationTemplate_CancelColorHEX();
/**
+ * The meta object literal for the '<em><b>Cancel Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getControlValidationTemplate_CancelForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Cancel Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTControlValidationTemplateImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTControlValidationTemplateImpl.java
index bd2a653..52aaae0 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTControlValidationTemplateImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTControlValidationTemplateImpl.java
@@ -25,36 +25,46 @@
* <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getOkColorHEX <em>Ok Color
- * HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getOkImageURL <em>Ok Image
- * URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getOkOverlayURL <em>Ok
- * Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getInfoColorHEX <em>Info
- * Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getInfoImageURL <em>Info
- * Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getInfoOverlayURL <em>Info
- * Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getWarningColorHEX <em>
- * Warning Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getWarningImageURL <em>
- * Warning Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getWarningOverlayURL <em>
- * Warning Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getErrorColorHEX <em>Error
- * Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getErrorImageURL <em>Error
- * Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getErrorOverlayURL <em>Error
- * Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getCancelColorHEX <em>Cancel
- * Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getCancelImageURL <em>Cancel
- * Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getCancelOverlayURL <em>
- * Cancel Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getOkColorHEX
+ * <em>Ok Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getOkImageURL
+ * <em>Ok Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getOkOverlayURL
+ * <em>Ok Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getInfoColorHEX
+ * <em>Info Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getInfoImageURL
+ * <em>Info Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getInfoOverlayURL
+ * <em>Info Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getWarningColorHEX
+ * <em>Warning Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getWarningImageURL
+ * <em>Warning Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getWarningOverlayURL
+ * <em>Warning Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getErrorColorHEX
+ * <em>Error Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getErrorImageURL
+ * <em>Error Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getErrorOverlayURL
+ * <em>Error Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getCancelColorHEX
+ * <em>Cancel Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getCancelImageURL
+ * <em>Cancel Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.model.impl.VTControlValidationTemplateImpl#getCancelOverlayURL
+ * <em>Cancel Overlay URL</em>}</li>
* </ul>
* </p>
*
@@ -86,6 +96,28 @@
protected String okColorHEX = OK_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getOkForegroundColorHEX() <em>Ok Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getOkForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String OK_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getOkForegroundColorHEX() <em>Ok Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getOkForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String okForegroundColorHEX = OK_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getOkImageURL() <em>Ok Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -152,6 +184,28 @@
protected String infoColorHEX = INFO_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getInfoForegroundColorHEX() <em>Info Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getInfoForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String INFO_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getInfoForegroundColorHEX() <em>Info Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getInfoForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String infoForegroundColorHEX = INFO_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getInfoImageURL() <em>Info Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -218,6 +272,30 @@
protected String warningColorHEX = WARNING_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getWarningForegroundColorHEX() <em>Warning Foreground Color HEX</em>}'
+ * attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getWarningForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String WARNING_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getWarningForegroundColorHEX() <em>Warning Foreground Color HEX</em>}'
+ * attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getWarningForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String warningForegroundColorHEX = WARNING_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getWarningImageURL() <em>Warning Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -284,6 +362,28 @@
protected String errorColorHEX = ERROR_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getErrorForegroundColorHEX() <em>Error Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getErrorForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String ERROR_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getErrorForegroundColorHEX() <em>Error Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getErrorForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String errorForegroundColorHEX = ERROR_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getErrorImageURL() <em>Error Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -350,6 +450,28 @@
protected String cancelColorHEX = CANCEL_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getCancelForegroundColorHEX() <em>Cancel Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getCancelForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getCancelForegroundColorHEX() <em>Cancel Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getCancelForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String cancelForegroundColorHEX = CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getCancelImageURL() <em>Cancel Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -452,8 +574,35 @@
* @generated
*/
@Override
- public String getOkImageURL()
- {
+ public String getOkForegroundColorHEX() {
+ return okForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setOkForegroundColorHEX(String newOkForegroundColorHEX) {
+ final String oldOkForegroundColorHEX = okForegroundColorHEX;
+ okForegroundColorHEX = newOkForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX, oldOkForegroundColorHEX,
+ okForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getOkImageURL() {
return okImageURL;
}
@@ -539,8 +688,35 @@
* @generated
*/
@Override
- public String getInfoImageURL()
- {
+ public String getInfoForegroundColorHEX() {
+ return infoForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setInfoForegroundColorHEX(String newInfoForegroundColorHEX) {
+ final String oldInfoForegroundColorHEX = infoForegroundColorHEX;
+ infoForegroundColorHEX = newInfoForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX, oldInfoForegroundColorHEX,
+ infoForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getInfoImageURL() {
return infoImageURL;
}
@@ -626,8 +802,35 @@
* @generated
*/
@Override
- public String getWarningImageURL()
- {
+ public String getWarningForegroundColorHEX() {
+ return warningForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setWarningForegroundColorHEX(String newWarningForegroundColorHEX) {
+ final String oldWarningForegroundColorHEX = warningForegroundColorHEX;
+ warningForegroundColorHEX = newWarningForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX,
+ oldWarningForegroundColorHEX, warningForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getWarningImageURL() {
return warningImageURL;
}
@@ -714,8 +917,35 @@
* @generated
*/
@Override
- public String getErrorImageURL()
- {
+ public String getErrorForegroundColorHEX() {
+ return errorForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setErrorForegroundColorHEX(String newErrorForegroundColorHEX) {
+ final String oldErrorForegroundColorHEX = errorForegroundColorHEX;
+ errorForegroundColorHEX = newErrorForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX, oldErrorForegroundColorHEX,
+ errorForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getErrorImageURL() {
return errorImageURL;
}
@@ -801,8 +1031,35 @@
* @generated
*/
@Override
- public String getCancelImageURL()
- {
+ public String getCancelForegroundColorHEX() {
+ return cancelForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setCancelForegroundColorHEX(String newCancelForegroundColorHEX) {
+ final String oldCancelForegroundColorHEX = cancelForegroundColorHEX;
+ cancelForegroundColorHEX = newCancelForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX, oldCancelForegroundColorHEX,
+ cancelForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getCancelImageURL() {
return cancelImageURL;
}
@@ -866,30 +1123,40 @@
{
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX:
return getOkColorHEX();
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX:
+ return getOkForegroundColorHEX();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL:
return getOkImageURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_OVERLAY_URL:
return getOkOverlayURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX:
return getInfoColorHEX();
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX:
+ return getInfoForegroundColorHEX();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL:
return getInfoImageURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_OVERLAY_URL:
return getInfoOverlayURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX:
return getWarningColorHEX();
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX:
+ return getWarningForegroundColorHEX();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL:
return getWarningImageURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_OVERLAY_URL:
return getWarningOverlayURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX:
return getErrorColorHEX();
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX:
+ return getErrorForegroundColorHEX();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL:
return getErrorImageURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_OVERLAY_URL:
return getErrorOverlayURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX:
return getCancelColorHEX();
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX:
+ return getCancelForegroundColorHEX();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL:
return getCancelImageURL();
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_OVERLAY_URL:
@@ -912,6 +1179,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX:
setOkColorHEX((String) newValue);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX:
+ setOkForegroundColorHEX((String) newValue);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL:
setOkImageURL((String) newValue);
return;
@@ -921,6 +1191,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX:
setInfoColorHEX((String) newValue);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX:
+ setInfoForegroundColorHEX((String) newValue);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL:
setInfoImageURL((String) newValue);
return;
@@ -930,6 +1203,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX:
setWarningColorHEX((String) newValue);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX:
+ setWarningForegroundColorHEX((String) newValue);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL:
setWarningImageURL((String) newValue);
return;
@@ -939,6 +1215,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX:
setErrorColorHEX((String) newValue);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX:
+ setErrorForegroundColorHEX((String) newValue);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL:
setErrorImageURL((String) newValue);
return;
@@ -948,6 +1227,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX:
setCancelColorHEX((String) newValue);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX:
+ setCancelForegroundColorHEX((String) newValue);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL:
setCancelImageURL((String) newValue);
return;
@@ -972,6 +1254,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX:
setOkColorHEX(OK_COLOR_HEX_EDEFAULT);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX:
+ setOkForegroundColorHEX(OK_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL:
setOkImageURL(OK_IMAGE_URL_EDEFAULT);
return;
@@ -981,6 +1266,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX:
setInfoColorHEX(INFO_COLOR_HEX_EDEFAULT);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX:
+ setInfoForegroundColorHEX(INFO_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL:
setInfoImageURL(INFO_IMAGE_URL_EDEFAULT);
return;
@@ -990,6 +1278,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX:
setWarningColorHEX(WARNING_COLOR_HEX_EDEFAULT);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX:
+ setWarningForegroundColorHEX(WARNING_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL:
setWarningImageURL(WARNING_IMAGE_URL_EDEFAULT);
return;
@@ -999,6 +1290,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX:
setErrorColorHEX(ERROR_COLOR_HEX_EDEFAULT);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX:
+ setErrorForegroundColorHEX(ERROR_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL:
setErrorImageURL(ERROR_IMAGE_URL_EDEFAULT);
return;
@@ -1008,6 +1302,9 @@
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX:
setCancelColorHEX(CANCEL_COLOR_HEX_EDEFAULT);
return;
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX:
+ setCancelForegroundColorHEX(CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL:
setCancelImageURL(CANCEL_IMAGE_URL_EDEFAULT);
return;
@@ -1031,14 +1328,20 @@
{
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX:
return OK_COLOR_HEX_EDEFAULT == null ? okColorHEX != null : !OK_COLOR_HEX_EDEFAULT.equals(okColorHEX);
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX:
+ return OK_FOREGROUND_COLOR_HEX_EDEFAULT == null ? okForegroundColorHEX != null
+ : !OK_FOREGROUND_COLOR_HEX_EDEFAULT.equals(okForegroundColorHEX);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL:
return OK_IMAGE_URL_EDEFAULT == null ? okImageURL != null : !OK_IMAGE_URL_EDEFAULT.equals(okImageURL);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__OK_OVERLAY_URL:
return OK_OVERLAY_URL_EDEFAULT == null ? okOverlayURL != null : !OK_OVERLAY_URL_EDEFAULT
.equals(okOverlayURL);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX:
- return INFO_COLOR_HEX_EDEFAULT == null ? infoColorHEX != null : !INFO_COLOR_HEX_EDEFAULT
- .equals(infoColorHEX);
+ return INFO_COLOR_HEX_EDEFAULT == null ? infoColorHEX != null
+ : !INFO_COLOR_HEX_EDEFAULT.equals(infoColorHEX);
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX:
+ return INFO_FOREGROUND_COLOR_HEX_EDEFAULT == null ? infoForegroundColorHEX != null
+ : !INFO_FOREGROUND_COLOR_HEX_EDEFAULT.equals(infoForegroundColorHEX);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL:
return INFO_IMAGE_URL_EDEFAULT == null ? infoImageURL != null : !INFO_IMAGE_URL_EDEFAULT
.equals(infoImageURL);
@@ -1046,8 +1349,11 @@
return INFO_OVERLAY_URL_EDEFAULT == null ? infoOverlayURL != null : !INFO_OVERLAY_URL_EDEFAULT
.equals(infoOverlayURL);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX:
- return WARNING_COLOR_HEX_EDEFAULT == null ? warningColorHEX != null : !WARNING_COLOR_HEX_EDEFAULT
- .equals(warningColorHEX);
+ return WARNING_COLOR_HEX_EDEFAULT == null ? warningColorHEX != null
+ : !WARNING_COLOR_HEX_EDEFAULT.equals(warningColorHEX);
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX:
+ return WARNING_FOREGROUND_COLOR_HEX_EDEFAULT == null ? warningForegroundColorHEX != null
+ : !WARNING_FOREGROUND_COLOR_HEX_EDEFAULT.equals(warningForegroundColorHEX);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL:
return WARNING_IMAGE_URL_EDEFAULT == null ? warningImageURL != null : !WARNING_IMAGE_URL_EDEFAULT
.equals(warningImageURL);
@@ -1055,8 +1361,11 @@
return WARNING_OVERLAY_URL_EDEFAULT == null ? warningOverlayURL != null : !WARNING_OVERLAY_URL_EDEFAULT
.equals(warningOverlayURL);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX:
- return ERROR_COLOR_HEX_EDEFAULT == null ? errorColorHEX != null : !ERROR_COLOR_HEX_EDEFAULT
- .equals(errorColorHEX);
+ return ERROR_COLOR_HEX_EDEFAULT == null ? errorColorHEX != null
+ : !ERROR_COLOR_HEX_EDEFAULT.equals(errorColorHEX);
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX:
+ return ERROR_FOREGROUND_COLOR_HEX_EDEFAULT == null ? errorForegroundColorHEX != null
+ : !ERROR_FOREGROUND_COLOR_HEX_EDEFAULT.equals(errorForegroundColorHEX);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL:
return ERROR_IMAGE_URL_EDEFAULT == null ? errorImageURL != null : !ERROR_IMAGE_URL_EDEFAULT
.equals(errorImageURL);
@@ -1064,8 +1373,11 @@
return ERROR_OVERLAY_URL_EDEFAULT == null ? errorOverlayURL != null : !ERROR_OVERLAY_URL_EDEFAULT
.equals(errorOverlayURL);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX:
- return CANCEL_COLOR_HEX_EDEFAULT == null ? cancelColorHEX != null : !CANCEL_COLOR_HEX_EDEFAULT
- .equals(cancelColorHEX);
+ return CANCEL_COLOR_HEX_EDEFAULT == null ? cancelColorHEX != null
+ : !CANCEL_COLOR_HEX_EDEFAULT.equals(cancelColorHEX);
+ case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX:
+ return CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT == null ? cancelForegroundColorHEX != null
+ : !CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT.equals(cancelForegroundColorHEX);
case VTTemplatePackage.CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL:
return CANCEL_IMAGE_URL_EDEFAULT == null ? cancelImageURL != null : !CANCEL_IMAGE_URL_EDEFAULT
.equals(cancelImageURL);
@@ -1092,30 +1404,40 @@
final StringBuffer result = new StringBuffer(super.toString());
result.append(" (okColorHEX: "); //$NON-NLS-1$
result.append(okColorHEX);
+ result.append(", okForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(okForegroundColorHEX);
result.append(", okImageURL: "); //$NON-NLS-1$
result.append(okImageURL);
result.append(", okOverlayURL: "); //$NON-NLS-1$
result.append(okOverlayURL);
result.append(", infoColorHEX: "); //$NON-NLS-1$
result.append(infoColorHEX);
+ result.append(", infoForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(infoForegroundColorHEX);
result.append(", infoImageURL: "); //$NON-NLS-1$
result.append(infoImageURL);
result.append(", infoOverlayURL: "); //$NON-NLS-1$
result.append(infoOverlayURL);
result.append(", warningColorHEX: "); //$NON-NLS-1$
result.append(warningColorHEX);
+ result.append(", warningForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(warningForegroundColorHEX);
result.append(", warningImageURL: "); //$NON-NLS-1$
result.append(warningImageURL);
result.append(", warningOverlayURL: "); //$NON-NLS-1$
result.append(warningOverlayURL);
result.append(", errorColorHEX: "); //$NON-NLS-1$
result.append(errorColorHEX);
+ result.append(", errorForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(errorForegroundColorHEX);
result.append(", errorImageURL: "); //$NON-NLS-1$
result.append(errorImageURL);
result.append(", errorOverlayURL: "); //$NON-NLS-1$
result.append(errorOverlayURL);
result.append(", cancelColorHEX: "); //$NON-NLS-1$
result.append(cancelColorHEX);
+ result.append(", cancelForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(cancelForegroundColorHEX);
result.append(", cancelImageURL: "); //$NON-NLS-1$
result.append(cancelImageURL);
result.append(", cancelOverlayURL: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTTemplatePackageImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTTemplatePackageImpl.java
index b449033..0706f56 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTTemplatePackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/model/impl/VTTemplatePackageImpl.java
@@ -31,8 +31,7 @@
*
* @generated
*/
-public class VTTemplatePackageImpl extends EPackageImpl implements VTTemplatePackage
-{
+public class VTTemplatePackageImpl extends EPackageImpl implements VTTemplatePackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -87,8 +86,7 @@
* @see #init()
* @generated
*/
- private VTTemplatePackageImpl()
- {
+ private VTTemplatePackageImpl() {
super(eNS_URI, VTTemplateFactory.eINSTANCE);
}
@@ -104,8 +102,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link VTTemplatePackage#eINSTANCE} when that field is accessed. Clients should
- * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+ * This method is used to initialize {@link VTTemplatePackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -113,16 +112,15 @@
* @see #initializePackageContents()
* @generated
*/
- public static VTTemplatePackage init()
- {
+ public static VTTemplatePackage init() {
if (isInited) {
return (VTTemplatePackage) EPackage.Registry.INSTANCE.getEPackage(VTTemplatePackage.eNS_URI);
}
// Obtain or create and register package
final VTTemplatePackageImpl theTemplatePackage = (VTTemplatePackageImpl) (EPackage.Registry.INSTANCE
- .get(eNS_URI) instanceof VTTemplatePackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI) : new VTTemplatePackageImpl());
+ .get(eNS_URI) instanceof VTTemplatePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new VTTemplatePackageImpl());
isInited = true;
@@ -147,8 +145,7 @@
* @generated
*/
@Override
- public EClass getViewTemplate()
- {
+ public EClass getViewTemplate() {
return viewTemplateEClass;
}
@@ -159,8 +156,7 @@
* @generated
*/
@Override
- public EReference getViewTemplate_ControlValidationConfiguration()
- {
+ public EReference getViewTemplate_ControlValidationConfiguration() {
return (EReference) viewTemplateEClass.getEStructuralFeatures().get(0);
}
@@ -171,8 +167,7 @@
* @generated
*/
@Override
- public EReference getViewTemplate_Styles()
- {
+ public EReference getViewTemplate_Styles() {
return (EReference) viewTemplateEClass.getEStructuralFeatures().get(1);
}
@@ -183,8 +178,7 @@
* @generated
*/
@Override
- public EAttribute getViewTemplate_ReferencedEcores()
- {
+ public EAttribute getViewTemplate_ReferencedEcores() {
return (EAttribute) viewTemplateEClass.getEStructuralFeatures().get(2);
}
@@ -195,8 +189,7 @@
* @generated
*/
@Override
- public EClass getControlValidationTemplate()
- {
+ public EClass getControlValidationTemplate() {
return controlValidationTemplateEClass;
}
@@ -207,8 +200,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_OkColorHEX()
- {
+ public EAttribute getControlValidationTemplate_OkColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(0);
}
@@ -219,8 +211,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_OkImageURL()
- {
+ public EAttribute getControlValidationTemplate_OkForegroundColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(1);
}
@@ -231,8 +222,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_OkOverlayURL()
- {
+ public EAttribute getControlValidationTemplate_OkImageURL() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(2);
}
@@ -243,8 +233,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_InfoColorHEX()
- {
+ public EAttribute getControlValidationTemplate_OkOverlayURL() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(3);
}
@@ -255,8 +244,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_InfoImageURL()
- {
+ public EAttribute getControlValidationTemplate_InfoColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(4);
}
@@ -267,8 +255,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_InfoOverlayURL()
- {
+ public EAttribute getControlValidationTemplate_InfoForegroundColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(5);
}
@@ -279,8 +266,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_WarningColorHEX()
- {
+ public EAttribute getControlValidationTemplate_InfoImageURL() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(6);
}
@@ -291,8 +277,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_WarningImageURL()
- {
+ public EAttribute getControlValidationTemplate_InfoOverlayURL() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(7);
}
@@ -303,8 +288,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_WarningOverlayURL()
- {
+ public EAttribute getControlValidationTemplate_WarningColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(8);
}
@@ -315,8 +299,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_ErrorColorHEX()
- {
+ public EAttribute getControlValidationTemplate_WarningForegroundColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(9);
}
@@ -327,8 +310,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_ErrorImageURL()
- {
+ public EAttribute getControlValidationTemplate_WarningImageURL() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(10);
}
@@ -339,8 +321,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_ErrorOverlayURL()
- {
+ public EAttribute getControlValidationTemplate_WarningOverlayURL() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(11);
}
@@ -351,8 +332,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_CancelColorHEX()
- {
+ public EAttribute getControlValidationTemplate_ErrorColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(12);
}
@@ -363,8 +343,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_CancelImageURL()
- {
+ public EAttribute getControlValidationTemplate_ErrorForegroundColorHEX() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(13);
}
@@ -375,8 +354,7 @@
* @generated
*/
@Override
- public EAttribute getControlValidationTemplate_CancelOverlayURL()
- {
+ public EAttribute getControlValidationTemplate_ErrorImageURL() {
return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(14);
}
@@ -387,8 +365,62 @@
* @generated
*/
@Override
- public EClass getStyle()
- {
+ public EAttribute getControlValidationTemplate_ErrorOverlayURL() {
+ return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(15);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getControlValidationTemplate_CancelColorHEX() {
+ return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(16);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getControlValidationTemplate_CancelForegroundColorHEX() {
+ return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(17);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getControlValidationTemplate_CancelImageURL() {
+ return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(18);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getControlValidationTemplate_CancelOverlayURL() {
+ return (EAttribute) controlValidationTemplateEClass.getEStructuralFeatures().get(19);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EClass getStyle() {
return styleEClass;
}
@@ -399,8 +431,7 @@
* @generated
*/
@Override
- public EReference getStyle_Selector()
- {
+ public EReference getStyle_Selector() {
return (EReference) styleEClass.getEStructuralFeatures().get(0);
}
@@ -483,18 +514,23 @@
controlValidationTemplateEClass = createEClass(CONTROL_VALIDATION_TEMPLATE);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__OK_COLOR_HEX);
+ createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__OK_FOREGROUND_COLOR_HEX);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__OK_IMAGE_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__OK_OVERLAY_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__INFO_COLOR_HEX);
+ createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__INFO_FOREGROUND_COLOR_HEX);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__INFO_IMAGE_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__INFO_OVERLAY_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__WARNING_COLOR_HEX);
+ createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__WARNING_FOREGROUND_COLOR_HEX);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__WARNING_IMAGE_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__WARNING_OVERLAY_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__ERROR_COLOR_HEX);
+ createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__ERROR_FOREGROUND_COLOR_HEX);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__ERROR_IMAGE_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__ERROR_OVERLAY_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__CANCEL_COLOR_HEX);
+ createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__CANCEL_FOREGROUND_COLOR_HEX);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__CANCEL_IMAGE_URL);
createEAttribute(controlValidationTemplateEClass, CONTROL_VALIDATION_TEMPLATE__CANCEL_OVERLAY_URL);
@@ -542,103 +578,94 @@
// Add supertypes to classes
// Initialize classes, features, and operations; add parameters
- initEClass(viewTemplateEClass, VTViewTemplate.class,
- "ViewTemplate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getViewTemplate_ControlValidationConfiguration(),
- getControlValidationTemplate(),
- null,
- "controlValidationConfiguration", null, 1, 1, VTViewTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getViewTemplate_Styles(),
- getStyle(),
- null,
- "styles", null, 0, -1, VTViewTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getViewTemplate_ReferencedEcores(),
- ecorePackage.getEString(),
- "referencedEcores", null, 0, -1, VTViewTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(viewTemplateEClass, VTViewTemplate.class, "ViewTemplate", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getViewTemplate_ControlValidationConfiguration(), getControlValidationTemplate(), null,
+ "controlValidationConfiguration", null, 1, 1, VTViewTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getViewTemplate_Styles(), getStyle(), null, "styles", null, 0, -1, VTViewTemplate.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getViewTemplate_ReferencedEcores(), ecorePackage.getEString(), "referencedEcores", null, 0, -1, //$NON-NLS-1$
+ VTViewTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
- initEClass(controlValidationTemplateEClass, VTControlValidationTemplate.class,
- "ControlValidationTemplate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_OkColorHEX(),
- ecorePackage.getEString(),
- "okColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_OkImageURL(),
- ecorePackage.getEString(),
- "okImageURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_OkOverlayURL(),
- ecorePackage.getEString(),
- "okOverlayURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_InfoColorHEX(),
- ecorePackage.getEString(),
- "infoColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_InfoImageURL(),
- ecorePackage.getEString(),
- "infoImageURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_InfoOverlayURL(),
- ecorePackage.getEString(),
- "infoOverlayURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_WarningColorHEX(),
- ecorePackage.getEString(),
- "warningColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_WarningImageURL(),
- ecorePackage.getEString(),
- "warningImageURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_WarningOverlayURL(),
- ecorePackage.getEString(),
- "warningOverlayURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_ErrorColorHEX(),
- ecorePackage.getEString(),
- "errorColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_ErrorImageURL(),
- ecorePackage.getEString(),
- "errorImageURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_ErrorOverlayURL(),
- ecorePackage.getEString(),
- "errorOverlayURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_CancelColorHEX(),
- ecorePackage.getEString(),
- "cancelColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_CancelImageURL(),
- ecorePackage.getEString(),
- "cancelImageURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getControlValidationTemplate_CancelOverlayURL(),
- ecorePackage.getEString(),
- "cancelOverlayURL", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(controlValidationTemplateEClass, VTControlValidationTemplate.class, "ControlValidationTemplate", //$NON-NLS-1$
+ !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getControlValidationTemplate_OkColorHEX(), ecorePackage.getEString(), "okColorHEX", null, 0, 1, //$NON-NLS-1$
+ VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_OkForegroundColorHEX(), ecorePackage.getEString(),
+ "okForegroundColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_OkImageURL(), ecorePackage.getEString(), "okImageURL", null, 0, 1, //$NON-NLS-1$
+ VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_OkOverlayURL(), ecorePackage.getEString(), "okOverlayURL", null, 0, //$NON-NLS-1$
+ 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_InfoColorHEX(), ecorePackage.getEString(), "infoColorHEX", null, 0, //$NON-NLS-1$
+ 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_InfoForegroundColorHEX(), ecorePackage.getEString(),
+ "infoForegroundColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_InfoImageURL(), ecorePackage.getEString(), "infoImageURL", null, 0, //$NON-NLS-1$
+ 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_InfoOverlayURL(), ecorePackage.getEString(), "infoOverlayURL", null, //$NON-NLS-1$
+ 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_WarningColorHEX(), ecorePackage.getEString(), "warningColorHEX", //$NON-NLS-1$
+ null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_WarningForegroundColorHEX(), ecorePackage.getEString(),
+ "warningForegroundColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_WarningImageURL(), ecorePackage.getEString(), "warningImageURL", //$NON-NLS-1$
+ null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_WarningOverlayURL(), ecorePackage.getEString(), "warningOverlayURL", //$NON-NLS-1$
+ null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_ErrorColorHEX(), ecorePackage.getEString(), "errorColorHEX", null, //$NON-NLS-1$
+ 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_ErrorForegroundColorHEX(), ecorePackage.getEString(),
+ "errorForegroundColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_ErrorImageURL(), ecorePackage.getEString(), "errorImageURL", null, //$NON-NLS-1$
+ 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_ErrorOverlayURL(), ecorePackage.getEString(), "errorOverlayURL", //$NON-NLS-1$
+ null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_CancelColorHEX(), ecorePackage.getEString(), "cancelColorHEX", null, //$NON-NLS-1$
+ 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_CancelForegroundColorHEX(), ecorePackage.getEString(),
+ "cancelForegroundColorHEX", null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_CancelImageURL(), ecorePackage.getEString(), "cancelImageURL", null, //$NON-NLS-1$
+ 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getControlValidationTemplate_CancelOverlayURL(), ecorePackage.getEString(), "cancelOverlayURL", //$NON-NLS-1$
+ null, 0, 1, VTControlValidationTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(styleEClass, VTStyle.class, "Style", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getStyle_Selector(),
- getStyleSelector(),
- null,
- "selector", null, 1, 1, VTStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getStyle_Properties(),
- getStyleProperty(),
- null,
- "properties", null, 0, -1, VTStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getStyle_Selector(), getStyleSelector(), null, "selector", null, 1, 1, VTStyle.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getStyle_Properties(), getStyleProperty(), null, "properties", null, 0, -1, VTStyle.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
- initEClass(stylePropertyEClass, VTStyleProperty.class,
- "StyleProperty", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEClass(stylePropertyEClass, VTStyleProperty.class, "StyleProperty", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
- initEClass(styleSelectorEClass, VTStyleSelector.class,
- "StyleSelector", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEClass(styleSelectorEClass, VTStyleSelector.class, "StyleSelector", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
// Create resource
createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/TabType.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/TabType.java
index a39fcb9..d4beebf 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/TabType.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/TabType.java
@@ -21,10 +21,9 @@
* <!-- begin-user-doc -->
* A representation of the literals of the enumeration '<em><b>Type</b></em>',
* and utility methods for working with them.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage#getTabType()
* @model
* @generated
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabFactory.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabFactory.java
index b8b33b5..808d2ad 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabFactory.java
@@ -17,10 +17,9 @@
* <!-- begin-user-doc -->
* The <b>Factory</b> for the model.
* It provides a create method for each non-abstract class of the model.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabPackage.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabPackage.java
index 0b0e3be..e6b263f 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabPackage.java
@@ -28,10 +28,9 @@
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabFactory
* @model kind="package"
* @generated
@@ -96,6 +95,66 @@
int TAB_STYLE_PROPERTY__TYPE = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Ok Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_STYLE_PROPERTY__OK_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Info Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_STYLE_PROPERTY__INFO_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Warning Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_STYLE_PROPERTY__WARNING_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Error Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_STYLE_PROPERTY__ERROR_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Cancel Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 5;
+
+ /**
* The number of structural features of the '<em>Style Property</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -103,7 +162,7 @@
* @generated
* @ordered
*/
- int TAB_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 1;
+ int TAB_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 6;
/**
* The number of operations of the '<em>Style Property</em>' class.
@@ -140,8 +199,8 @@
EClass getTabStyleProperty();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getType <em>Type</em>}'.
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getType <em>Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -153,8 +212,88 @@
EAttribute getTabStyleProperty_Type();
/**
- * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.template.style.tab.model.TabType <em>Type</em>}
- * '.
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getOkImageURL <em>Ok Image
+ * URL</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Ok Image URL</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getOkImageURL()
+ * @see #getTabStyleProperty()
+ * @generated
+ */
+ EAttribute getTabStyleProperty_OkImageURL();
+
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getInfoImageURL <em>Info Image
+ * URL</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Info Image URL</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getInfoImageURL()
+ * @see #getTabStyleProperty()
+ * @generated
+ */
+ EAttribute getTabStyleProperty_InfoImageURL();
+
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getWarningImageURL <em>Warning Image
+ * URL</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Warning Image URL</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getWarningImageURL()
+ * @see #getTabStyleProperty()
+ * @generated
+ */
+ EAttribute getTabStyleProperty_WarningImageURL();
+
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getErrorImageURL <em>Error Image
+ * URL</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Error Image URL</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getErrorImageURL()
+ * @see #getTabStyleProperty()
+ * @generated
+ */
+ EAttribute getTabStyleProperty_ErrorImageURL();
+
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getCancelImageURL <em>Cancel Image
+ * URL</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Cancel Image URL</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getCancelImageURL()
+ * @see #getTabStyleProperty()
+ * @generated
+ */
+ EAttribute getTabStyleProperty_CancelImageURL();
+
+ /**
+ * Returns the meta object for enum '{@link org.eclipse.emf.ecp.view.template.style.tab.model.TabType
+ * <em>Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -190,9 +329,9 @@
*/
interface Literals {
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl <em>Style Property</em>}
- * ' class.
+ * The meta object literal for the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl <em>Style
+ * Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -212,6 +351,61 @@
EAttribute TAB_STYLE_PROPERTY__TYPE = eINSTANCE.getTabStyleProperty_Type();
/**
+ * The meta object literal for the '<em><b>Ok Image URL</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TAB_STYLE_PROPERTY__OK_IMAGE_URL = eINSTANCE.getTabStyleProperty_OkImageURL();
+
+ /**
+ * The meta object literal for the '<em><b>Info Image URL</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TAB_STYLE_PROPERTY__INFO_IMAGE_URL = eINSTANCE.getTabStyleProperty_InfoImageURL();
+
+ /**
+ * The meta object literal for the '<em><b>Warning Image URL</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TAB_STYLE_PROPERTY__WARNING_IMAGE_URL = eINSTANCE.getTabStyleProperty_WarningImageURL();
+
+ /**
+ * The meta object literal for the '<em><b>Error Image URL</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TAB_STYLE_PROPERTY__ERROR_IMAGE_URL = eINSTANCE.getTabStyleProperty_ErrorImageURL();
+
+ /**
+ * The meta object literal for the '<em><b>Cancel Image URL</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL = eINSTANCE.getTabStyleProperty_CancelImageURL();
+
+ /**
* The meta object literal for the '{@link org.eclipse.emf.ecp.view.template.style.tab.model.TabType
* <em>Type</em>}' enum.
* <!-- begin-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabStyleProperty.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabStyleProperty.java
index 909fba1..688e141 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabStyleProperty.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/VTTabStyleProperty.java
@@ -16,7 +16,7 @@
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Style Property</b></em>'.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
*
@@ -25,6 +25,16 @@
* </p>
* <ul>
* <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getOkImageURL <em>Ok Image
+ * URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getInfoImageURL <em>Info Image
+ * URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getWarningImageURL <em>Warning
+ * Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getErrorImageURL <em>Error
+ * Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getCancelImageURL <em>Cancel
+ * Image URL</em>}</li>
* </ul>
*
* @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage#getTabStyleProperty()
@@ -65,4 +75,173 @@
*/
void setType(TabType value);
+ /**
+ * Returns the value of the '<em><b>Ok Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Ok Image URL</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Ok Image URL</em>' attribute.
+ * @see #setOkImageURL(String)
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage#getTabStyleProperty_OkImageURL()
+ * @model
+ * @generated
+ */
+ String getOkImageURL();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getOkImageURL
+ * <em>Ok Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Ok Image URL</em>' attribute.
+ * @see #getOkImageURL()
+ * @generated
+ */
+ void setOkImageURL(String value);
+
+ /**
+ * Returns the value of the '<em><b>Info Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Info Image URL</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Info Image URL</em>' attribute.
+ * @see #setInfoImageURL(String)
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage#getTabStyleProperty_InfoImageURL()
+ * @model
+ * @generated
+ */
+ String getInfoImageURL();
+
+ /**
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getInfoImageURL <em>Info Image
+ * URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Info Image URL</em>' attribute.
+ * @see #getInfoImageURL()
+ * @generated
+ */
+ void setInfoImageURL(String value);
+
+ /**
+ * Returns the value of the '<em><b>Warning Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Warning Image URL</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Warning Image URL</em>' attribute.
+ * @see #setWarningImageURL(String)
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage#getTabStyleProperty_WarningImageURL()
+ * @model
+ * @generated
+ */
+ String getWarningImageURL();
+
+ /**
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getWarningImageURL <em>Warning Image
+ * URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Warning Image URL</em>' attribute.
+ * @see #getWarningImageURL()
+ * @generated
+ */
+ void setWarningImageURL(String value);
+
+ /**
+ * Returns the value of the '<em><b>Error Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Error Image URL</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Error Image URL</em>' attribute.
+ * @see #setErrorImageURL(String)
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage#getTabStyleProperty_ErrorImageURL()
+ * @model
+ * @generated
+ */
+ String getErrorImageURL();
+
+ /**
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getErrorImageURL <em>Error Image
+ * URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Error Image URL</em>' attribute.
+ * @see #getErrorImageURL()
+ * @generated
+ */
+ void setErrorImageURL(String value);
+
+ /**
+ * Returns the value of the '<em><b>Cancel Image URL</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Cancel Image URL</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Cancel Image URL</em>' attribute.
+ * @see #setCancelImageURL(String)
+ * @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage#getTabStyleProperty_CancelImageURL()
+ * @model
+ * @generated
+ */
+ String getCancelImageURL();
+
+ /**
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty#getCancelImageURL <em>Cancel Image
+ * URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Cancel Image URL</em>' attribute.
+ * @see #getCancelImageURL()
+ * @generated
+ */
+ void setCancelImageURL(String value);
+
} // VTTabStyleProperty
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabFactoryImpl.java
index 7651f83..4815fc0 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabFactoryImpl.java
@@ -25,10 +25,9 @@
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
- *
* @generated
*/
public class VTTabFactoryImpl extends EFactoryImpl implements VTTabFactory {
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabPackageImpl.java
index 625c2a7..aec5299 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabPackageImpl.java
@@ -25,10 +25,9 @@
/**
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
- *
* @generated
*/
public class VTTabPackageImpl extends EPackageImpl implements VTTabPackage {
@@ -144,6 +143,71 @@
/**
* <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getTabStyleProperty_OkImageURL() {
+ return (EAttribute) tabStylePropertyEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getTabStyleProperty_InfoImageURL() {
+ return (EAttribute) tabStylePropertyEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getTabStyleProperty_WarningImageURL() {
+ return (EAttribute) tabStylePropertyEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getTabStyleProperty_ErrorImageURL() {
+ return (EAttribute) tabStylePropertyEClass.getEStructuralFeatures().get(4);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getTabStyleProperty_CancelImageURL() {
+ return (EAttribute) tabStylePropertyEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -189,6 +253,11 @@
// Create classes and their features
tabStylePropertyEClass = createEClass(TAB_STYLE_PROPERTY);
createEAttribute(tabStylePropertyEClass, TAB_STYLE_PROPERTY__TYPE);
+ createEAttribute(tabStylePropertyEClass, TAB_STYLE_PROPERTY__OK_IMAGE_URL);
+ createEAttribute(tabStylePropertyEClass, TAB_STYLE_PROPERTY__INFO_IMAGE_URL);
+ createEAttribute(tabStylePropertyEClass, TAB_STYLE_PROPERTY__WARNING_IMAGE_URL);
+ createEAttribute(tabStylePropertyEClass, TAB_STYLE_PROPERTY__ERROR_IMAGE_URL);
+ createEAttribute(tabStylePropertyEClass, TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL);
// Create enums
tabTypeEEnum = createEEnum(TAB_TYPE);
@@ -237,6 +306,21 @@
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getTabStyleProperty_Type(), getTabType(), "type", "BOTTOM", 1, 1, VTTabStyleProperty.class, //$NON-NLS-1$ //$NON-NLS-2$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTabStyleProperty_OkImageURL(), ecorePackage.getEString(), "okImageURL", null, 0, 1, //$NON-NLS-1$
+ VTTabStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTabStyleProperty_InfoImageURL(), ecorePackage.getEString(), "infoImageURL", null, 0, 1, //$NON-NLS-1$
+ VTTabStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTabStyleProperty_WarningImageURL(), ecorePackage.getEString(), "warningImageURL", null, 0, 1, //$NON-NLS-1$
+ VTTabStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTabStyleProperty_ErrorImageURL(), ecorePackage.getEString(), "errorImageURL", null, 0, 1, //$NON-NLS-1$
+ VTTabStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTabStyleProperty_CancelImageURL(), ecorePackage.getEString(), "cancelImageURL", null, 0, 1, //$NON-NLS-1$
+ VTTabStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
initEEnum(tabTypeEEnum, TabType.class, "TabType"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabStylePropertyImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabStylePropertyImpl.java
index 5b9cfed..d87f4d4 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabStylePropertyImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/impl/VTTabStylePropertyImpl.java
@@ -23,15 +23,25 @@
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Style Property</b></em>'.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl#getType <em>Type</em>
- * }</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl#getType
+ * <em>Type</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl#getOkImageURL <em>Ok
+ * Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl#getInfoImageURL
+ * <em>Info Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl#getWarningImageURL
+ * <em>Warning Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl#getErrorImageURL
+ * <em>Error Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tab.model.impl.VTTabStylePropertyImpl#getCancelImageURL
+ * <em>Cancel Image URL</em>}</li>
* </ul>
*
* @generated
@@ -60,6 +70,136 @@
protected TabType type = TYPE_EDEFAULT;
/**
+ * The default value of the '{@link #getOkImageURL() <em>Ok Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getOkImageURL()
+ * @generated
+ * @ordered
+ */
+ protected static final String OK_IMAGE_URL_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getOkImageURL() <em>Ok Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getOkImageURL()
+ * @generated
+ * @ordered
+ */
+ protected String okImageURL = OK_IMAGE_URL_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getInfoImageURL() <em>Info Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getInfoImageURL()
+ * @generated
+ * @ordered
+ */
+ protected static final String INFO_IMAGE_URL_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getInfoImageURL() <em>Info Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getInfoImageURL()
+ * @generated
+ * @ordered
+ */
+ protected String infoImageURL = INFO_IMAGE_URL_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getWarningImageURL() <em>Warning Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getWarningImageURL()
+ * @generated
+ * @ordered
+ */
+ protected static final String WARNING_IMAGE_URL_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getWarningImageURL() <em>Warning Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getWarningImageURL()
+ * @generated
+ * @ordered
+ */
+ protected String warningImageURL = WARNING_IMAGE_URL_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getErrorImageURL() <em>Error Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getErrorImageURL()
+ * @generated
+ * @ordered
+ */
+ protected static final String ERROR_IMAGE_URL_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getErrorImageURL() <em>Error Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getErrorImageURL()
+ * @generated
+ * @ordered
+ */
+ protected String errorImageURL = ERROR_IMAGE_URL_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getCancelImageURL() <em>Cancel Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getCancelImageURL()
+ * @generated
+ * @ordered
+ */
+ protected static final String CANCEL_IMAGE_URL_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getCancelImageURL() <em>Cancel Image URL</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @see #getCancelImageURL()
+ * @generated
+ * @ordered
+ */
+ protected String cancelImageURL = CANCEL_IMAGE_URL_EDEFAULT;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -109,6 +249,161 @@
/**
* <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getOkImageURL() {
+ return okImageURL;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setOkImageURL(String newOkImageURL) {
+ final String oldOkImageURL = okImageURL;
+ okImageURL = newOkImageURL;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, VTTabPackage.TAB_STYLE_PROPERTY__OK_IMAGE_URL,
+ oldOkImageURL, okImageURL));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getInfoImageURL() {
+ return infoImageURL;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setInfoImageURL(String newInfoImageURL) {
+ final String oldInfoImageURL = infoImageURL;
+ infoImageURL = newInfoImageURL;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, VTTabPackage.TAB_STYLE_PROPERTY__INFO_IMAGE_URL,
+ oldInfoImageURL, infoImageURL));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getWarningImageURL() {
+ return warningImageURL;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setWarningImageURL(String newWarningImageURL) {
+ final String oldWarningImageURL = warningImageURL;
+ warningImageURL = newWarningImageURL;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, VTTabPackage.TAB_STYLE_PROPERTY__WARNING_IMAGE_URL,
+ oldWarningImageURL, warningImageURL));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getErrorImageURL() {
+ return errorImageURL;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setErrorImageURL(String newErrorImageURL) {
+ final String oldErrorImageURL = errorImageURL;
+ errorImageURL = newErrorImageURL;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, VTTabPackage.TAB_STYLE_PROPERTY__ERROR_IMAGE_URL,
+ oldErrorImageURL, errorImageURL));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getCancelImageURL() {
+ return cancelImageURL;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setCancelImageURL(String newCancelImageURL) {
+ final String oldCancelImageURL = cancelImageURL;
+ cancelImageURL = newCancelImageURL;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, VTTabPackage.TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL,
+ oldCancelImageURL, cancelImageURL));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
@@ -118,6 +413,16 @@
switch (featureID) {
case VTTabPackage.TAB_STYLE_PROPERTY__TYPE:
return getType();
+ case VTTabPackage.TAB_STYLE_PROPERTY__OK_IMAGE_URL:
+ return getOkImageURL();
+ case VTTabPackage.TAB_STYLE_PROPERTY__INFO_IMAGE_URL:
+ return getInfoImageURL();
+ case VTTabPackage.TAB_STYLE_PROPERTY__WARNING_IMAGE_URL:
+ return getWarningImageURL();
+ case VTTabPackage.TAB_STYLE_PROPERTY__ERROR_IMAGE_URL:
+ return getErrorImageURL();
+ case VTTabPackage.TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL:
+ return getCancelImageURL();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -134,6 +439,21 @@
case VTTabPackage.TAB_STYLE_PROPERTY__TYPE:
setType((TabType) newValue);
return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__OK_IMAGE_URL:
+ setOkImageURL((String) newValue);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__INFO_IMAGE_URL:
+ setInfoImageURL((String) newValue);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__WARNING_IMAGE_URL:
+ setWarningImageURL((String) newValue);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__ERROR_IMAGE_URL:
+ setErrorImageURL((String) newValue);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL:
+ setCancelImageURL((String) newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -150,6 +470,21 @@
case VTTabPackage.TAB_STYLE_PROPERTY__TYPE:
setType(TYPE_EDEFAULT);
return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__OK_IMAGE_URL:
+ setOkImageURL(OK_IMAGE_URL_EDEFAULT);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__INFO_IMAGE_URL:
+ setInfoImageURL(INFO_IMAGE_URL_EDEFAULT);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__WARNING_IMAGE_URL:
+ setWarningImageURL(WARNING_IMAGE_URL_EDEFAULT);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__ERROR_IMAGE_URL:
+ setErrorImageURL(ERROR_IMAGE_URL_EDEFAULT);
+ return;
+ case VTTabPackage.TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL:
+ setCancelImageURL(CANCEL_IMAGE_URL_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -165,6 +500,20 @@
switch (featureID) {
case VTTabPackage.TAB_STYLE_PROPERTY__TYPE:
return type != TYPE_EDEFAULT;
+ case VTTabPackage.TAB_STYLE_PROPERTY__OK_IMAGE_URL:
+ return OK_IMAGE_URL_EDEFAULT == null ? okImageURL != null : !OK_IMAGE_URL_EDEFAULT.equals(okImageURL);
+ case VTTabPackage.TAB_STYLE_PROPERTY__INFO_IMAGE_URL:
+ return INFO_IMAGE_URL_EDEFAULT == null ? infoImageURL != null
+ : !INFO_IMAGE_URL_EDEFAULT.equals(infoImageURL);
+ case VTTabPackage.TAB_STYLE_PROPERTY__WARNING_IMAGE_URL:
+ return WARNING_IMAGE_URL_EDEFAULT == null ? warningImageURL != null
+ : !WARNING_IMAGE_URL_EDEFAULT.equals(warningImageURL);
+ case VTTabPackage.TAB_STYLE_PROPERTY__ERROR_IMAGE_URL:
+ return ERROR_IMAGE_URL_EDEFAULT == null ? errorImageURL != null
+ : !ERROR_IMAGE_URL_EDEFAULT.equals(errorImageURL);
+ case VTTabPackage.TAB_STYLE_PROPERTY__CANCEL_IMAGE_URL:
+ return CANCEL_IMAGE_URL_EDEFAULT == null ? cancelImageURL != null
+ : !CANCEL_IMAGE_URL_EDEFAULT.equals(cancelImageURL);
}
return super.eIsSet(featureID);
}
@@ -184,6 +533,16 @@
final StringBuffer result = new StringBuffer(super.toString());
result.append(" (type: "); //$NON-NLS-1$
result.append(type);
+ result.append(", okImageURL: "); //$NON-NLS-1$
+ result.append(okImageURL);
+ result.append(", infoImageURL: "); //$NON-NLS-1$
+ result.append(infoImageURL);
+ result.append(", warningImageURL: "); //$NON-NLS-1$
+ result.append(warningImageURL);
+ result.append(", errorImageURL: "); //$NON-NLS-1$
+ result.append(errorImageURL);
+ result.append(", cancelImageURL: "); //$NON-NLS-1$
+ result.append(cancelImageURL);
result.append(')');
return result.toString();
}
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabAdapterFactory.java
index 46c2695..591eb5f 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabAdapterFactory.java
@@ -23,10 +23,9 @@
* <!-- begin-user-doc -->
* The <b>Adapter Factory</b> for the model.
* It provides an adapter <code>createXXX</code> method for each class of the model.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage
* @generated
*/
@@ -113,8 +112,8 @@
}
/**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty <em>Style Property</em>}'.
+ * Creates a new adapter for an object of class
+ * '{@link org.eclipse.emf.ecp.view.template.style.tab.model.VTTabStyleProperty <em>Style Property</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabSwitch.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabSwitch.java
index cb03ab9..8007587 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabSwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tab/model/util/TabSwitch.java
@@ -27,10 +27,9 @@
* and proceeding up the inheritance hierarchy
* until a non-null result is returned,
* which is the result of the switch.
- *
+ *
* @since 1.8
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationPackage.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationPackage.java
index a0795cb..729747e 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationPackage.java
@@ -95,6 +95,19 @@
int VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Ok Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT
+ + 1;
+
+ /**
* The feature id for the '<em><b>Ok Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -102,7 +115,7 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 1;
+ int VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Ok Overlay URL</b></em>' attribute.
@@ -112,7 +125,7 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__OK_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 2;
+ int VALIDATION_STYLE_PROPERTY__OK_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Info Color HEX</b></em>' attribute.
@@ -122,7 +135,20 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 3;
+ int VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Info Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT
+ + 5;
/**
* The feature id for the '<em><b>Info Image URL</b></em>' attribute.
@@ -132,17 +158,17 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 4;
+ int VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Info Overlay URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__INFO_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 5;
+ int VALIDATION_STYLE_PROPERTY__INFO_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Warning Color HEX</b></em>' attribute.
@@ -152,7 +178,20 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 6;
+ int VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 8;
+
+ /**
+ * The feature id for the '<em><b>Warning Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT
+ + 9;
/**
* The feature id for the '<em><b>Warning Image URL</b></em>' attribute.
@@ -162,17 +201,17 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 7;
+ int VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Warning Overlay URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__WARNING_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 8;
+ int VALIDATION_STYLE_PROPERTY__WARNING_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Error Color HEX</b></em>' attribute.
@@ -182,7 +221,20 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 9;
+ int VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 12;
+
+ /**
+ * The feature id for the '<em><b>Error Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT
+ + 13;
/**
* The feature id for the '<em><b>Error Image URL</b></em>' attribute.
@@ -192,7 +244,7 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 10;
+ int VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Error Overlay URL</b></em>' attribute.
@@ -202,7 +254,7 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__ERROR_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 11;
+ int VALIDATION_STYLE_PROPERTY__ERROR_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Cancel Color HEX</b></em>' attribute.
@@ -212,37 +264,50 @@
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 12;
+ int VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 16;
+
+ /**
+ * The feature id for the '<em><b>Cancel Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT
+ + 17;
/**
* The feature id for the '<em><b>Cancel Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 13;
+ int VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 18;
/**
* The feature id for the '<em><b>Cancel Overlay URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY__CANCEL_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 14;
+ int VALIDATION_STYLE_PROPERTY__CANCEL_OVERLAY_URL = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 19;
/**
* The number of structural features of the '<em>Style Property</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
- int VALIDATION_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 15;
+ int VALIDATION_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 20;
/**
* The number of operations of the '<em>Style Property</em>' class.
@@ -283,6 +348,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Ok Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkForegroundColorHEX()
+ * @see #getValidationStyleProperty()
+ * @generated
+ */
+ EAttribute getValidationStyleProperty_OkForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkImageURL
* <em>Ok Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -325,6 +406,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Info Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoForegroundColorHEX()
+ * @see #getValidationStyleProperty()
+ * @generated
+ */
+ EAttribute getValidationStyleProperty_InfoForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoImageURL
* <em>Info Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -367,6 +464,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Warning Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningForegroundColorHEX()
+ * @see #getValidationStyleProperty()
+ * @generated
+ */
+ EAttribute getValidationStyleProperty_WarningForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningImageURL
* <em>Warning Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -409,6 +522,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Error Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorForegroundColorHEX()
+ * @see #getValidationStyleProperty()
+ * @generated
+ */
+ EAttribute getValidationStyleProperty_ErrorForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorImageURL
* <em>Error Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -451,6 +580,22 @@
/**
* Returns the meta object for the attribute '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Cancel Foreground Color HEX</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelForegroundColorHEX()
+ * @see #getValidationStyleProperty()
+ * @generated
+ */
+ EAttribute getValidationStyleProperty_CancelForegroundColorHEX();
+
+ /**
+ * Returns the meta object for the attribute '
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelImageURL
* <em>Cancel Image URL</em>}'.
* <!-- begin-user-doc -->
@@ -525,6 +670,18 @@
EAttribute VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX = eINSTANCE.getValidationStyleProperty_OkColorHEX();
/**
+ * The meta object literal for the '<em><b>Ok Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getValidationStyleProperty_OkForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Ok Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -552,6 +709,18 @@
EAttribute VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX = eINSTANCE.getValidationStyleProperty_InfoColorHEX();
/**
+ * The meta object literal for the '<em><b>Info Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getValidationStyleProperty_InfoForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Info Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -580,6 +749,18 @@
.getValidationStyleProperty_WarningColorHEX();
/**
+ * The meta object literal for the '<em><b>Warning Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getValidationStyleProperty_WarningForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Warning Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -609,6 +790,18 @@
EAttribute VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX = eINSTANCE.getValidationStyleProperty_ErrorColorHEX();
/**
+ * The meta object literal for the '<em><b>Error Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getValidationStyleProperty_ErrorForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Error Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -637,6 +830,18 @@
EAttribute VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX = eINSTANCE.getValidationStyleProperty_CancelColorHEX();
/**
+ * The meta object literal for the '<em><b>Cancel Foreground Color HEX</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX = eINSTANCE
+ .getValidationStyleProperty_CancelForegroundColorHEX();
+
+ /**
* The meta object literal for the '<em><b>Cancel Image URL</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationStyleProperty.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationStyleProperty.java
index a28f33d..c836e2f 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationStyleProperty.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/VTValidationStyleProperty.java
@@ -21,34 +21,48 @@
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkColorHEX <em>Ok
- * Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkImageURL <em>Ok
- * Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkOverlayURL <em>Ok
- * Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoColorHEX <em>
- * Info Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoImageURL <em>
- * Info Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoOverlayURL <em>
- * Info Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningColorHEX <em>
- * Warning Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningImageURL <em>
- * Warning Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkColorHEX
+ * <em>Ok Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkImageURL
+ * <em>Ok Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkOverlayURL
+ * <em>Ok Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoColorHEX
+ * <em>Info Color HEX</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoImageURL
+ * <em>Info Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoOverlayURL
+ * <em>Info Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningColorHEX
+ * <em>Warning Color HEX</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningImageURL
+ * <em>Warning Image URL</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningOverlayURL
* <em>Warning Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorColorHEX <em>
- * Error Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorImageURL <em>
- * Error Image URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorOverlayURL <em>
- * Error Overlay URL</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelColorHEX <em>
- * Cancel Color HEX</em>}</li>
- * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelImageURL <em>
- * Cancel Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorColorHEX
+ * <em>Error Color HEX</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorImageURL
+ * <em>Error Image URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorOverlayURL
+ * <em>Error Overlay URL</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelColorHEX
+ * <em>Cancel Color HEX</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelImageURL
+ * <em>Cancel Image URL</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelOverlayURL
* <em>Cancel Overlay URL</em>}</li>
* </ul>
@@ -90,6 +104,40 @@
void setOkColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Ok Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Ok Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Ok Foreground Color HEX</em>' attribute.
+ * @see #setOkForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage#getValidationStyleProperty_OkForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getOkForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Ok Foreground Color HEX</em>' attribute.
+ * @see #getOkForegroundColorHEX()
+ * @generated
+ */
+ void setOkForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Ok Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -180,6 +228,40 @@
void setInfoColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Info Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Info Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Info Foreground Color HEX</em>' attribute.
+ * @see #setInfoForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage#getValidationStyleProperty_InfoForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getInfoForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Info Foreground Color HEX</em>' attribute.
+ * @see #getInfoForegroundColorHEX()
+ * @generated
+ */
+ void setInfoForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Info Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -270,6 +352,40 @@
void setWarningColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Warning Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Warning Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Warning Foreground Color HEX</em>' attribute.
+ * @see #setWarningForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage#getValidationStyleProperty_WarningForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getWarningForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Warning Foreground Color HEX</em>' attribute.
+ * @see #getWarningForegroundColorHEX()
+ * @generated
+ */
+ void setWarningForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Warning Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -360,6 +476,40 @@
void setErrorColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Error Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Error Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Error Foreground Color HEX</em>' attribute.
+ * @see #setErrorForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage#getValidationStyleProperty_ErrorForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getErrorForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Error Foreground Color HEX</em>' attribute.
+ * @see #getErrorForegroundColorHEX()
+ * @generated
+ */
+ void setErrorForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Error Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
@@ -450,6 +600,40 @@
void setCancelColorHEX(String value);
/**
+ * Returns the value of the '<em><b>Cancel Foreground Color HEX</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Cancel Foreground Color HEX</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Cancel Foreground Color HEX</em>' attribute.
+ * @see #setCancelForegroundColorHEX(String)
+ * @see org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage#getValidationStyleProperty_CancelForegroundColorHEX()
+ * @model
+ * @generated
+ */
+ String getCancelForegroundColorHEX();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationStyleProperty#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.10
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Cancel Foreground Color HEX</em>' attribute.
+ * @see #getCancelForegroundColorHEX()
+ * @generated
+ */
+ void setCancelForegroundColorHEX(String value);
+
+ /**
* Returns the value of the '<em><b>Cancel Image URL</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationPackageImpl.java
index 98e8f13..e6833ea 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationPackageImpl.java
@@ -83,7 +83,7 @@
// Obtain or create and register package
final VTValidationPackageImpl theValidationPackage = (VTValidationPackageImpl) (EPackage.Registry.INSTANCE
.get(eNS_URI) instanceof VTValidationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new VTValidationPackageImpl());
+ : new VTValidationPackageImpl());
isInited = true;
@@ -133,7 +133,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_OkImageURL() {
+ public EAttribute getValidationStyleProperty_OkForegroundColorHEX() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(1);
}
@@ -144,7 +144,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_OkOverlayURL() {
+ public EAttribute getValidationStyleProperty_OkImageURL() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(2);
}
@@ -155,7 +155,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_InfoColorHEX() {
+ public EAttribute getValidationStyleProperty_OkOverlayURL() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(3);
}
@@ -166,7 +166,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_InfoImageURL() {
+ public EAttribute getValidationStyleProperty_InfoColorHEX() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(4);
}
@@ -177,7 +177,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_InfoOverlayURL() {
+ public EAttribute getValidationStyleProperty_InfoForegroundColorHEX() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(5);
}
@@ -188,7 +188,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_WarningColorHEX() {
+ public EAttribute getValidationStyleProperty_InfoImageURL() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(6);
}
@@ -199,7 +199,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_WarningImageURL() {
+ public EAttribute getValidationStyleProperty_InfoOverlayURL() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(7);
}
@@ -210,7 +210,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_WarningOverlayURL() {
+ public EAttribute getValidationStyleProperty_WarningColorHEX() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(8);
}
@@ -221,7 +221,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_ErrorColorHEX() {
+ public EAttribute getValidationStyleProperty_WarningForegroundColorHEX() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(9);
}
@@ -232,7 +232,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_ErrorImageURL() {
+ public EAttribute getValidationStyleProperty_WarningImageURL() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(10);
}
@@ -243,7 +243,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_ErrorOverlayURL() {
+ public EAttribute getValidationStyleProperty_WarningOverlayURL() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(11);
}
@@ -254,7 +254,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_CancelColorHEX() {
+ public EAttribute getValidationStyleProperty_ErrorColorHEX() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(12);
}
@@ -265,7 +265,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_CancelImageURL() {
+ public EAttribute getValidationStyleProperty_ErrorForegroundColorHEX() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(13);
}
@@ -276,7 +276,7 @@
* @generated
*/
@Override
- public EAttribute getValidationStyleProperty_CancelOverlayURL() {
+ public EAttribute getValidationStyleProperty_ErrorImageURL() {
return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(14);
}
@@ -287,6 +287,61 @@
* @generated
*/
@Override
+ public EAttribute getValidationStyleProperty_ErrorOverlayURL() {
+ return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(15);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getValidationStyleProperty_CancelColorHEX() {
+ return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(16);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getValidationStyleProperty_CancelForegroundColorHEX() {
+ return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(17);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getValidationStyleProperty_CancelImageURL() {
+ return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(18);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getValidationStyleProperty_CancelOverlayURL() {
+ return (EAttribute) validationStylePropertyEClass.getEStructuralFeatures().get(19);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public VTValidationFactory getValidationFactory() {
return (VTValidationFactory) getEFactoryInstance();
}
@@ -316,18 +371,23 @@
// Create classes and their features
validationStylePropertyEClass = createEClass(VALIDATION_STYLE_PROPERTY);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX);
+ createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__OK_OVERLAY_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX);
+ createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__INFO_OVERLAY_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX);
+ createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__WARNING_OVERLAY_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX);
+ createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__ERROR_OVERLAY_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX);
+ createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL);
createEAttribute(validationStylePropertyEClass, VALIDATION_STYLE_PROPERTY__CANCEL_OVERLAY_URL);
}
@@ -371,68 +431,68 @@
validationStylePropertyEClass.getESuperTypes().add(theTemplatePackage.getStyleProperty());
// Initialize classes, features, and operations; add parameters
- initEClass(validationStylePropertyEClass, VTValidationStyleProperty.class,
- "ValidationStyleProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_OkColorHEX(),
- ecorePackage.getEString(),
- "okColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_OkImageURL(),
- ecorePackage.getEString(),
- "okImageURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_OkOverlayURL(),
- ecorePackage.getEString(),
- "okOverlayURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_InfoColorHEX(),
- ecorePackage.getEString(),
- "infoColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_InfoImageURL(),
- ecorePackage.getEString(),
- "infoImageURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_InfoOverlayURL(),
- ecorePackage.getEString(),
- "infoOverlayURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_WarningColorHEX(),
- ecorePackage.getEString(),
- "warningColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_WarningImageURL(),
- ecorePackage.getEString(),
- "warningImageURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_WarningOverlayURL(),
- ecorePackage.getEString(),
- "warningOverlayURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_ErrorColorHEX(),
- ecorePackage.getEString(),
- "errorColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_ErrorImageURL(),
- ecorePackage.getEString(),
- "errorImageURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_ErrorOverlayURL(),
- ecorePackage.getEString(),
- "errorOverlayURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_CancelColorHEX(),
- ecorePackage.getEString(),
- "cancelColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_CancelImageURL(),
- ecorePackage.getEString(),
- "cancelImageURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getValidationStyleProperty_CancelOverlayURL(),
- ecorePackage.getEString(),
- "cancelOverlayURL", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(validationStylePropertyEClass, VTValidationStyleProperty.class, "ValidationStyleProperty", //$NON-NLS-1$
+ !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getValidationStyleProperty_OkColorHEX(), ecorePackage.getEString(), "okColorHEX", null, 0, 1, //$NON-NLS-1$
+ VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_OkForegroundColorHEX(), ecorePackage.getEString(),
+ "okForegroundColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_OkImageURL(), ecorePackage.getEString(), "okImageURL", null, 0, 1, //$NON-NLS-1$
+ VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_OkOverlayURL(), ecorePackage.getEString(), "okOverlayURL", null, 0, 1, //$NON-NLS-1$
+ VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_InfoColorHEX(), ecorePackage.getEString(), "infoColorHEX", null, 0, 1, //$NON-NLS-1$
+ VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_InfoForegroundColorHEX(), ecorePackage.getEString(),
+ "infoForegroundColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_InfoImageURL(), ecorePackage.getEString(), "infoImageURL", null, 0, 1, //$NON-NLS-1$
+ VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_InfoOverlayURL(), ecorePackage.getEString(), "infoOverlayURL", null, //$NON-NLS-1$
+ 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_WarningColorHEX(), ecorePackage.getEString(), "warningColorHEX", null, //$NON-NLS-1$
+ 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_WarningForegroundColorHEX(), ecorePackage.getEString(),
+ "warningForegroundColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_WarningImageURL(), ecorePackage.getEString(), "warningImageURL", null, //$NON-NLS-1$
+ 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_WarningOverlayURL(), ecorePackage.getEString(), "warningOverlayURL", //$NON-NLS-1$
+ null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_ErrorColorHEX(), ecorePackage.getEString(), "errorColorHEX", null, 0, //$NON-NLS-1$
+ 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_ErrorForegroundColorHEX(), ecorePackage.getEString(),
+ "errorForegroundColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_ErrorImageURL(), ecorePackage.getEString(), "errorImageURL", null, 0, //$NON-NLS-1$
+ 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_ErrorOverlayURL(), ecorePackage.getEString(), "errorOverlayURL", null, //$NON-NLS-1$
+ 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_CancelColorHEX(), ecorePackage.getEString(), "cancelColorHEX", null, //$NON-NLS-1$
+ 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_CancelForegroundColorHEX(), ecorePackage.getEString(),
+ "cancelForegroundColorHEX", null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_CancelImageURL(), ecorePackage.getEString(), "cancelImageURL", null, //$NON-NLS-1$
+ 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getValidationStyleProperty_CancelOverlayURL(), ecorePackage.getEString(), "cancelOverlayURL", //$NON-NLS-1$
+ null, 0, 1, VTValidationStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationStylePropertyImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationStylePropertyImpl.java
index 244bd0f..82ed2e8 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationStylePropertyImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/validation/model/impl/VTValidationStylePropertyImpl.java
@@ -29,6 +29,9 @@
* <ul>
* <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getOkColorHEX
* <em>Ok Color HEX</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getOkForegroundColorHEX
+ * <em>Ok Foreground Color HEX</em>}</li>
* <li>{@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getOkImageURL
* <em>Ok Image URL</em>}</li>
* <li>
@@ -38,6 +41,9 @@
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getInfoColorHEX
* <em>Info Color HEX</em>}</li>
* <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getInfoForegroundColorHEX
+ * <em>Info Foreground Color HEX</em>}</li>
+ * <li>
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getInfoImageURL
* <em>Info Image URL</em>}</li>
* <li>
@@ -47,6 +53,9 @@
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getWarningColorHEX
* <em>Warning Color HEX</em>}</li>
* <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getWarningForegroundColorHEX
+ * <em>Warning Foreground Color HEX</em>}</li>
+ * <li>
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getWarningImageURL
* <em>Warning Image URL</em>}</li>
* <li>
@@ -56,6 +65,9 @@
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getErrorColorHEX
* <em>Error Color HEX</em>}</li>
* <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getErrorForegroundColorHEX
+ * <em>Error Foreground Color HEX</em>}</li>
+ * <li>
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getErrorImageURL
* <em>Error Image URL</em>}</li>
* <li>
@@ -65,6 +77,9 @@
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getCancelColorHEX
* <em>Cancel Color HEX</em>}</li>
* <li>
+ * {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getCancelForegroundColorHEX
+ * <em>Cancel Foreground Color HEX</em>}</li>
+ * <li>
* {@link org.eclipse.emf.ecp.view.template.style.validation.model.impl.VTValidationStylePropertyImpl#getCancelImageURL
* <em>Cancel Image URL</em>}</li>
* <li>
@@ -99,6 +114,28 @@
protected String okColorHEX = OK_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getOkForegroundColorHEX() <em>Ok Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getOkForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String OK_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getOkForegroundColorHEX() <em>Ok Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getOkForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String okForegroundColorHEX = OK_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getOkImageURL() <em>Ok Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -165,6 +202,28 @@
protected String infoColorHEX = INFO_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getInfoForegroundColorHEX() <em>Info Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getInfoForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String INFO_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getInfoForegroundColorHEX() <em>Info Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getInfoForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String infoForegroundColorHEX = INFO_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getInfoImageURL() <em>Info Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -231,6 +290,30 @@
protected String warningColorHEX = WARNING_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getWarningForegroundColorHEX() <em>Warning Foreground Color HEX</em>}'
+ * attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getWarningForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String WARNING_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getWarningForegroundColorHEX() <em>Warning Foreground Color HEX</em>}'
+ * attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getWarningForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String warningForegroundColorHEX = WARNING_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getWarningImageURL() <em>Warning Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -297,6 +380,28 @@
protected String errorColorHEX = ERROR_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getErrorForegroundColorHEX() <em>Error Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getErrorForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String ERROR_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getErrorForegroundColorHEX() <em>Error Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getErrorForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String errorForegroundColorHEX = ERROR_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getErrorImageURL() <em>Error Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -363,6 +468,28 @@
protected String cancelColorHEX = CANCEL_COLOR_HEX_EDEFAULT;
/**
+ * The default value of the '{@link #getCancelForegroundColorHEX() <em>Cancel Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getCancelForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected static final String CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getCancelForegroundColorHEX() <em>Cancel Foreground Color HEX</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getCancelForegroundColorHEX()
+ * @generated
+ * @ordered
+ */
+ protected String cancelForegroundColorHEX = CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT;
+
+ /**
* The default value of the '{@link #getCancelImageURL() <em>Cancel Image URL</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -461,6 +588,34 @@
* @generated
*/
@Override
+ public String getOkForegroundColorHEX() {
+ return okForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setOkForegroundColorHEX(String newOkForegroundColorHEX) {
+ final String oldOkForegroundColorHEX = okForegroundColorHEX;
+ okForegroundColorHEX = newOkForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX, oldOkForegroundColorHEX,
+ okForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public String getOkImageURL() {
return okImageURL;
}
@@ -542,6 +697,34 @@
* @generated
*/
@Override
+ public String getInfoForegroundColorHEX() {
+ return infoForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setInfoForegroundColorHEX(String newInfoForegroundColorHEX) {
+ final String oldInfoForegroundColorHEX = infoForegroundColorHEX;
+ infoForegroundColorHEX = newInfoForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX, oldInfoForegroundColorHEX,
+ infoForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public String getInfoImageURL() {
return infoImageURL;
}
@@ -623,6 +806,34 @@
* @generated
*/
@Override
+ public String getWarningForegroundColorHEX() {
+ return warningForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setWarningForegroundColorHEX(String newWarningForegroundColorHEX) {
+ final String oldWarningForegroundColorHEX = warningForegroundColorHEX;
+ warningForegroundColorHEX = newWarningForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX,
+ oldWarningForegroundColorHEX, warningForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public String getWarningImageURL() {
return warningImageURL;
}
@@ -705,6 +916,34 @@
* @generated
*/
@Override
+ public String getErrorForegroundColorHEX() {
+ return errorForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setErrorForegroundColorHEX(String newErrorForegroundColorHEX) {
+ final String oldErrorForegroundColorHEX = errorForegroundColorHEX;
+ errorForegroundColorHEX = newErrorForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX, oldErrorForegroundColorHEX,
+ errorForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public String getErrorImageURL() {
return errorImageURL;
}
@@ -786,6 +1025,34 @@
* @generated
*/
@Override
+ public String getCancelForegroundColorHEX() {
+ return cancelForegroundColorHEX;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setCancelForegroundColorHEX(String newCancelForegroundColorHEX) {
+ final String oldCancelForegroundColorHEX = cancelForegroundColorHEX;
+ cancelForegroundColorHEX = newCancelForegroundColorHEX;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX, oldCancelForegroundColorHEX,
+ cancelForegroundColorHEX));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public String getCancelImageURL() {
return cancelImageURL;
}
@@ -845,30 +1112,40 @@
switch (featureID) {
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX:
return getOkColorHEX();
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX:
+ return getOkForegroundColorHEX();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL:
return getOkImageURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_OVERLAY_URL:
return getOkOverlayURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX:
return getInfoColorHEX();
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX:
+ return getInfoForegroundColorHEX();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL:
return getInfoImageURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_OVERLAY_URL:
return getInfoOverlayURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX:
return getWarningColorHEX();
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX:
+ return getWarningForegroundColorHEX();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL:
return getWarningImageURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_OVERLAY_URL:
return getWarningOverlayURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX:
return getErrorColorHEX();
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX:
+ return getErrorForegroundColorHEX();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL:
return getErrorImageURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_OVERLAY_URL:
return getErrorOverlayURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX:
return getCancelColorHEX();
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX:
+ return getCancelForegroundColorHEX();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL:
return getCancelImageURL();
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_OVERLAY_URL:
@@ -889,6 +1166,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX:
setOkColorHEX((String) newValue);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX:
+ setOkForegroundColorHEX((String) newValue);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL:
setOkImageURL((String) newValue);
return;
@@ -898,6 +1178,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX:
setInfoColorHEX((String) newValue);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX:
+ setInfoForegroundColorHEX((String) newValue);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL:
setInfoImageURL((String) newValue);
return;
@@ -907,6 +1190,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX:
setWarningColorHEX((String) newValue);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX:
+ setWarningForegroundColorHEX((String) newValue);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL:
setWarningImageURL((String) newValue);
return;
@@ -916,6 +1202,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX:
setErrorColorHEX((String) newValue);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX:
+ setErrorForegroundColorHEX((String) newValue);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL:
setErrorImageURL((String) newValue);
return;
@@ -925,6 +1214,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX:
setCancelColorHEX((String) newValue);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX:
+ setCancelForegroundColorHEX((String) newValue);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL:
setCancelImageURL((String) newValue);
return;
@@ -947,6 +1239,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX:
setOkColorHEX(OK_COLOR_HEX_EDEFAULT);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX:
+ setOkForegroundColorHEX(OK_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL:
setOkImageURL(OK_IMAGE_URL_EDEFAULT);
return;
@@ -956,6 +1251,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX:
setInfoColorHEX(INFO_COLOR_HEX_EDEFAULT);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX:
+ setInfoForegroundColorHEX(INFO_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL:
setInfoImageURL(INFO_IMAGE_URL_EDEFAULT);
return;
@@ -965,6 +1263,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX:
setWarningColorHEX(WARNING_COLOR_HEX_EDEFAULT);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX:
+ setWarningForegroundColorHEX(WARNING_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL:
setWarningImageURL(WARNING_IMAGE_URL_EDEFAULT);
return;
@@ -974,6 +1275,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX:
setErrorColorHEX(ERROR_COLOR_HEX_EDEFAULT);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX:
+ setErrorForegroundColorHEX(ERROR_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL:
setErrorImageURL(ERROR_IMAGE_URL_EDEFAULT);
return;
@@ -983,6 +1287,9 @@
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX:
setCancelColorHEX(CANCEL_COLOR_HEX_EDEFAULT);
return;
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX:
+ setCancelForegroundColorHEX(CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT);
+ return;
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL:
setCancelImageURL(CANCEL_IMAGE_URL_EDEFAULT);
return;
@@ -1004,47 +1311,62 @@
switch (featureID) {
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_COLOR_HEX:
return OK_COLOR_HEX_EDEFAULT == null ? okColorHEX != null : !OK_COLOR_HEX_EDEFAULT.equals(okColorHEX);
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_FOREGROUND_COLOR_HEX:
+ return OK_FOREGROUND_COLOR_HEX_EDEFAULT == null ? okForegroundColorHEX != null
+ : !OK_FOREGROUND_COLOR_HEX_EDEFAULT.equals(okForegroundColorHEX);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_IMAGE_URL:
return OK_IMAGE_URL_EDEFAULT == null ? okImageURL != null : !OK_IMAGE_URL_EDEFAULT.equals(okImageURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__OK_OVERLAY_URL:
- return OK_OVERLAY_URL_EDEFAULT == null ? okOverlayURL != null : !OK_OVERLAY_URL_EDEFAULT
- .equals(okOverlayURL);
+ return OK_OVERLAY_URL_EDEFAULT == null ? okOverlayURL != null
+ : !OK_OVERLAY_URL_EDEFAULT.equals(okOverlayURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_COLOR_HEX:
- return INFO_COLOR_HEX_EDEFAULT == null ? infoColorHEX != null : !INFO_COLOR_HEX_EDEFAULT
- .equals(infoColorHEX);
+ return INFO_COLOR_HEX_EDEFAULT == null ? infoColorHEX != null
+ : !INFO_COLOR_HEX_EDEFAULT.equals(infoColorHEX);
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_FOREGROUND_COLOR_HEX:
+ return INFO_FOREGROUND_COLOR_HEX_EDEFAULT == null ? infoForegroundColorHEX != null
+ : !INFO_FOREGROUND_COLOR_HEX_EDEFAULT.equals(infoForegroundColorHEX);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_IMAGE_URL:
- return INFO_IMAGE_URL_EDEFAULT == null ? infoImageURL != null : !INFO_IMAGE_URL_EDEFAULT
- .equals(infoImageURL);
+ return INFO_IMAGE_URL_EDEFAULT == null ? infoImageURL != null
+ : !INFO_IMAGE_URL_EDEFAULT.equals(infoImageURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__INFO_OVERLAY_URL:
- return INFO_OVERLAY_URL_EDEFAULT == null ? infoOverlayURL != null : !INFO_OVERLAY_URL_EDEFAULT
- .equals(infoOverlayURL);
+ return INFO_OVERLAY_URL_EDEFAULT == null ? infoOverlayURL != null
+ : !INFO_OVERLAY_URL_EDEFAULT.equals(infoOverlayURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_COLOR_HEX:
- return WARNING_COLOR_HEX_EDEFAULT == null ? warningColorHEX != null : !WARNING_COLOR_HEX_EDEFAULT
- .equals(warningColorHEX);
+ return WARNING_COLOR_HEX_EDEFAULT == null ? warningColorHEX != null
+ : !WARNING_COLOR_HEX_EDEFAULT.equals(warningColorHEX);
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_FOREGROUND_COLOR_HEX:
+ return WARNING_FOREGROUND_COLOR_HEX_EDEFAULT == null ? warningForegroundColorHEX != null
+ : !WARNING_FOREGROUND_COLOR_HEX_EDEFAULT.equals(warningForegroundColorHEX);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_IMAGE_URL:
- return WARNING_IMAGE_URL_EDEFAULT == null ? warningImageURL != null : !WARNING_IMAGE_URL_EDEFAULT
- .equals(warningImageURL);
+ return WARNING_IMAGE_URL_EDEFAULT == null ? warningImageURL != null
+ : !WARNING_IMAGE_URL_EDEFAULT.equals(warningImageURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__WARNING_OVERLAY_URL:
- return WARNING_OVERLAY_URL_EDEFAULT == null ? warningOverlayURL != null : !WARNING_OVERLAY_URL_EDEFAULT
- .equals(warningOverlayURL);
+ return WARNING_OVERLAY_URL_EDEFAULT == null ? warningOverlayURL != null
+ : !WARNING_OVERLAY_URL_EDEFAULT.equals(warningOverlayURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_COLOR_HEX:
- return ERROR_COLOR_HEX_EDEFAULT == null ? errorColorHEX != null : !ERROR_COLOR_HEX_EDEFAULT
- .equals(errorColorHEX);
+ return ERROR_COLOR_HEX_EDEFAULT == null ? errorColorHEX != null
+ : !ERROR_COLOR_HEX_EDEFAULT.equals(errorColorHEX);
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_FOREGROUND_COLOR_HEX:
+ return ERROR_FOREGROUND_COLOR_HEX_EDEFAULT == null ? errorForegroundColorHEX != null
+ : !ERROR_FOREGROUND_COLOR_HEX_EDEFAULT.equals(errorForegroundColorHEX);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_IMAGE_URL:
- return ERROR_IMAGE_URL_EDEFAULT == null ? errorImageURL != null : !ERROR_IMAGE_URL_EDEFAULT
- .equals(errorImageURL);
+ return ERROR_IMAGE_URL_EDEFAULT == null ? errorImageURL != null
+ : !ERROR_IMAGE_URL_EDEFAULT.equals(errorImageURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__ERROR_OVERLAY_URL:
- return ERROR_OVERLAY_URL_EDEFAULT == null ? errorOverlayURL != null : !ERROR_OVERLAY_URL_EDEFAULT
- .equals(errorOverlayURL);
+ return ERROR_OVERLAY_URL_EDEFAULT == null ? errorOverlayURL != null
+ : !ERROR_OVERLAY_URL_EDEFAULT.equals(errorOverlayURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_COLOR_HEX:
- return CANCEL_COLOR_HEX_EDEFAULT == null ? cancelColorHEX != null : !CANCEL_COLOR_HEX_EDEFAULT
- .equals(cancelColorHEX);
+ return CANCEL_COLOR_HEX_EDEFAULT == null ? cancelColorHEX != null
+ : !CANCEL_COLOR_HEX_EDEFAULT.equals(cancelColorHEX);
+ case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_FOREGROUND_COLOR_HEX:
+ return CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT == null ? cancelForegroundColorHEX != null
+ : !CANCEL_FOREGROUND_COLOR_HEX_EDEFAULT.equals(cancelForegroundColorHEX);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_IMAGE_URL:
- return CANCEL_IMAGE_URL_EDEFAULT == null ? cancelImageURL != null : !CANCEL_IMAGE_URL_EDEFAULT
- .equals(cancelImageURL);
+ return CANCEL_IMAGE_URL_EDEFAULT == null ? cancelImageURL != null
+ : !CANCEL_IMAGE_URL_EDEFAULT.equals(cancelImageURL);
case VTValidationPackage.VALIDATION_STYLE_PROPERTY__CANCEL_OVERLAY_URL:
- return CANCEL_OVERLAY_URL_EDEFAULT == null ? cancelOverlayURL != null : !CANCEL_OVERLAY_URL_EDEFAULT
- .equals(cancelOverlayURL);
+ return CANCEL_OVERLAY_URL_EDEFAULT == null ? cancelOverlayURL != null
+ : !CANCEL_OVERLAY_URL_EDEFAULT.equals(cancelOverlayURL);
}
return super.eIsSet(featureID);
}
@@ -1064,30 +1386,40 @@
final StringBuffer result = new StringBuffer(super.toString());
result.append(" (okColorHEX: "); //$NON-NLS-1$
result.append(okColorHEX);
+ result.append(", okForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(okForegroundColorHEX);
result.append(", okImageURL: "); //$NON-NLS-1$
result.append(okImageURL);
result.append(", okOverlayURL: "); //$NON-NLS-1$
result.append(okOverlayURL);
result.append(", infoColorHEX: "); //$NON-NLS-1$
result.append(infoColorHEX);
+ result.append(", infoForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(infoForegroundColorHEX);
result.append(", infoImageURL: "); //$NON-NLS-1$
result.append(infoImageURL);
result.append(", infoOverlayURL: "); //$NON-NLS-1$
result.append(infoOverlayURL);
result.append(", warningColorHEX: "); //$NON-NLS-1$
result.append(warningColorHEX);
+ result.append(", warningForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(warningForegroundColorHEX);
result.append(", warningImageURL: "); //$NON-NLS-1$
result.append(warningImageURL);
result.append(", warningOverlayURL: "); //$NON-NLS-1$
result.append(warningOverlayURL);
result.append(", errorColorHEX: "); //$NON-NLS-1$
result.append(errorColorHEX);
+ result.append(", errorForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(errorForegroundColorHEX);
result.append(", errorImageURL: "); //$NON-NLS-1$
result.append(errorImageURL);
result.append(", errorOverlayURL: "); //$NON-NLS-1$
result.append(errorOverlayURL);
result.append(", cancelColorHEX: "); //$NON-NLS-1$
result.append(cancelColorHEX);
+ result.append(", cancelForegroundColorHEX: "); //$NON-NLS-1$
+ result.append(cancelForegroundColorHEX);
result.append(", cancelImageURL: "); //$NON-NLS-1$
result.append(cancelImageURL);
result.append(", cancelOverlayURL: "); //$NON-NLS-1$
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 953e672..d03fb32 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.template.service/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewTemplate Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.template.service.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.10.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/viewTemplate.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
index d2bf259..becb16e 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.template.service/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.tooling/META-INF/MANIFEST.MF
index e21e0c3..d57e09f 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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.editor;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.9.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.editor;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.10.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
Require-Bundle: org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.100.0,4.0.0)",
@@ -18,22 +18,22 @@
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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.editor;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.jface.databinding.swt;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml b/bundles/org.eclipse.emf.ecp.view.template.tooling/pom.xml
index ba24268..e4cbd2e 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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateColorHexControlTester.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateColorHexControlTester.java
index 34894db..927fd21 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateColorHexControlTester.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateColorHexControlTester.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -61,34 +61,64 @@
if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_OkColorHEX().equals(feature)) {
return 5;
}
+ if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_OkForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_InfoColorHEX().equals(feature)) {
return 5;
}
+ if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_InfoForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_WarningColorHEX().equals(feature)) {
return 5;
}
+ if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_WarningForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_ErrorColorHEX().equals(feature)) {
return 5;
}
+ if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_ErrorForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_CancelColorHEX().equals(feature)) {
return 5;
}
+ if (VTValidationPackage.eINSTANCE.getValidationStyleProperty_CancelForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
// template validation (Deprecated)
if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_OkColorHEX().equals(feature)) {
return 5;
}
+ if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_OkForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_InfoColorHEX().equals(feature)) {
return 5;
}
+ if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_InfoForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_WarningColorHEX().equals(feature)) {
return 5;
}
+ if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_WarningForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_ErrorColorHEX().equals(feature)) {
return 5;
}
+ if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_ErrorForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_CancelColorHEX().equals(feature)) {
return 5;
}
+ if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_CancelForegroundColorHEX().equals(feature)) {
+ return 5;
+ }
// background
if (VTBackgroundPackage.eINSTANCE.getBackgroundStyleProperty_Color().equals(feature)) {
return 5;
diff --git a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateImagePathControlTester.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateImagePathControlTester.java
index 9d414ed..20b0dde 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateImagePathControlTester.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/internal/tooling/controls/TemplateImagePathControlTester.java
@@ -20,6 +20,7 @@
import org.eclipse.emf.ecp.view.spi.model.VElement;
import org.eclipse.emf.ecp.view.template.internal.tooling.Activator;
import org.eclipse.emf.ecp.view.template.model.VTTemplatePackage;
+import org.eclipse.emf.ecp.view.template.style.tab.model.VTTabPackage;
import org.eclipse.emf.ecp.view.template.style.tableValidation.model.VTTableValidationPackage;
import org.eclipse.emf.ecp.view.template.style.validation.model.VTValidationPackage;
import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
@@ -123,6 +124,22 @@
if (VTTemplatePackage.eINSTANCE.getControlValidationTemplate_CancelOverlayURL().equals(feature)) {
return 5;
}
+ // tab validation
+ if (VTTabPackage.eINSTANCE.getTabStyleProperty_OkImageURL().equals(feature)) {
+ return 5;
+ }
+ if (VTTabPackage.eINSTANCE.getTabStyleProperty_InfoImageURL().equals(feature)) {
+ return 5;
+ }
+ if (VTTabPackage.eINSTANCE.getTabStyleProperty_WarningImageURL().equals(feature)) {
+ return 5;
+ }
+ if (VTTabPackage.eINSTANCE.getTabStyleProperty_ErrorImageURL().equals(feature)) {
+ return 5;
+ }
+ if (VTTabPackage.eINSTANCE.getTabStyleProperty_CancelImageURL().equals(feature)) {
+ return 5;
+ }
return NOT_APPLICABLE;
}
// END COMPLEX CODE
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 ca36467..5cc91f2 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model.provider;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model.edit/pom.xml
index 8a91a55..4ac3529 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 107d12d..ebab767 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.9.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.10.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.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.model/pom.xml
index 49f33aa..424536e 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
index 8a8e4af..c8c7681 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,33 @@
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.9.0.qualifier
+Bundle-Version: 1.10.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.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.9.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.9.0";x-internal:=true,
- org.eclipse.emf.edit.ui.action.ecp;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.10.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.edit.ui.action.ecp;version="1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/TreeMasterDetailSWTRendererService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.core.commands;version="0.0.0",
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.10.0,2.0.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",
@@ -39,5 +40,4 @@
org.eclipse.swt.graphics;version="0.0.0",
org.eclipse.swt.layout;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
- org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional,
- javax.inject;version="1.0.0"
+ org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
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 cbf928a..dda1c04 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 e799661..1e72617 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
@@ -594,7 +594,6 @@
/* The header */
final Composite header = new Composite(container, SWT.FILL);
final GridLayout headerLayout = GridLayoutFactory.fillDefaults().create();
- headerLayout.marginWidth = 5;
header.setLayout(headerLayout);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(header);
header.setBackground(rightPanel.getBackground());
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 117b722..714eafd 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms TreeMasterDetail Services
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)",
org.eclipse.jface.viewers;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.validation/pom.xml
index 96013f4..65b0a37 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.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 31c10dc..9961813 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.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.internal.unset.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.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 0a08df2..78eb3a3 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.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/META-INF/MANIFEST.MF
index bfeb458..36bcf62 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,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Util RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt.rap
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.internal.util.swt.rap.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.rap.rwt;bundle-version="[2.2.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
index acc9195..f9d3f90 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.util.swt.rap</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
index 34431ca..bbdd6e1 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Util
Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.util.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.util.swt;version="1.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/rcpImageRegistry.xml
Import-Package: org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
index b748b16..ae022b4 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.util.swt</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
index 0a86718..029ad0e 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default Bean Validation
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.default;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.validation
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
index 8e3143a..3ea8986 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation.bean.default</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
index c0daa0c..beb79d8 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms BeanValidation
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.internal.validation.bean.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
index 57c0252..5694543 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation.bean</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
index f225ce5..aa3a8d0 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Validation Service
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.internal.validation.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.9.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.10.0";
x-friends:="org.eclipse.emf.ecp.view.table.ui,
org.eclipse.emf.ecp.view.custom.ui,
org.eclipse.emf.ecp.edit.swt,
org.eclipse.emf.ecp.test.model",
- org.eclipse.emf.ecp.view.spi.validation;version="1.9.0"
+ org.eclipse.emf.ecp.view.spi.validation;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
index ea66f59..8b54571 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.validation/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java
index e0d3be6..dc0b6ca 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.validation/src/org/eclipse/emf/ecp/view/internal/validation/ValidationServiceImpl.java
@@ -115,13 +115,19 @@
final Set<EObject> eObjectsToValidate = new LinkedHashSet<EObject>();
eObjectsToValidate.add(observed);
final EStructuralFeature structuralFeature = (EStructuralFeature) observableValue.getValueType();
- if (EReference.class.isInstance(structuralFeature)) {
+ final Object value = observableValue.getValue();
+ if (EReference.class.isInstance(structuralFeature) && value != null) {
+ /*
+ * the value may be null! this is possible e.g. when there is a longer feature path dmr on
+ * which an element on the path gets deleted/replaced during runtime.
+ * Adding null to the set is no advised as we will get exception immediately or in the future.
+ */
if (structuralFeature.isMany()) {
@SuppressWarnings("unchecked")
- final List<EObject> list = (List<EObject>) observableValue.getValue();
+ final List<EObject> list = (List<EObject>) value;
eObjectsToValidate.addAll(list);
} else {
- eObjectsToValidate.add((EObject) observableValue.getValue());
+ eObjectsToValidate.add((EObject) value);
}
}
validate(eObjectsToValidate);
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
index 6b1f293..2d757dd 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.view.spi.vertical.model.provider.VerticalEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
index bb80288..a5ad174 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model.edit/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.vertical.model.edit</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
index 0060f53..ed52306 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
index 18b30c5..69b0e7d 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.model/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.vertical.model</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
index 38c8475..f498ddb 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Vertical UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
index c2d5991..b423d83 100644
--- a/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.vertical.ui.swt/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
index 41ffa82..a8cf1a4 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider.ViewproxyEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
index b271fd9..cfd69ff 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model.edit/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
index 1b464d7..84cdec4 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.9.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.10.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.10.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore
index d4165d7..8f4d212 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/model/viewproxy.ecore
@@ -3,6 +3,6 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="viewproxy" nsURI="http://org/eclipse/emf/ecp/view/viewproxy/model"
nsPrefix="org.eclipse.emf.ecp.view.viewproxy.model">
<eClassifiers xsi:type="ecore:EClass" name="ViewProxy" eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
index d7b2320..ee263a7 100644
--- a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
index bbf55be..c1ad731 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewModel Workspace Migrator
Bundle-SymbolicName: org.eclipse.emf.ecp.view.workspace.migrator;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.10.0,2.0.0)",
org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/workspaceMigrator.xml
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.9.0"
diff --git a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
index 608f486..6e4d26a 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.workspace.migrator</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
index e20d7c1..d964fa0 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Workspace Integration Core
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.core;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.core.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.internal.core;version="1.9.0";x-friends:="org.eclipse.emf.ecp.workspace.ui,org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.workspace.internal.core;version="1.10.0";x-friends:="org.eclipse.emf.ecp.workspace.ui,org.eclipse.emf.ecp.ui.view.editor.controls"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
index 4627edd..834a0a8 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.workspace.core</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
index fc929dc..09010bd 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Workspace Integration UI
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.ui.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.1.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.jface.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
index 2305bea..5a9ec63 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.workspace.ui</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
index 95ff311..8554615 100644
--- a/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.rap.edit.ui.minimal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Minimal RAP EMF Edit UI
Bundle-SymbolicName: org.eclipse.emf.rap.edit.ui.minimal
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.edit.ui.provider.Activator
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emf.edit.ui.dnd;version="2.10.0",
diff --git a/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml b/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
index 27e8b77..55b3037 100644
--- a/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
+++ b/bundles/org.eclipse.emf.rap.edit.ui.minimal/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.rap.edit.ui.minimal</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
index 211854d..b7cbe1b 100644
--- a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Common
Bundle-SymbolicName: org.eclipse.emfforms.common
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.common;version="1.9.0",
- org.eclipse.emfforms.internal.common.report;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.common.locale;version="1.9.0",
- org.eclipse.emfforms.spi.common.report;version="1.9.0"
+Export-Package: org.eclipse.emfforms.common;version="1.10.0",
+ org.eclipse.emfforms.internal.common.report;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common.locale;version="1.10.0",
+ org.eclipse.emfforms.spi.common.report;version="1.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.common.report.ReportServiceImpl.xml
Import-Package: org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.common/pom.xml b/bundles/org.eclipse.emfforms.common/pom.xml
index c636df3..52b343b 100644
--- a/bundles/org.eclipse.emfforms.common/pom.xml
+++ b/bundles/org.eclipse.emfforms.common/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.common</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
index 21ffdec..be911d5 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Featurepath Databinding Services
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)"
Service-Component: OSGI-INF/featurePathDomainModelReferenceConverterService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
index 2481e2f..2758ff9 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.featurepath/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
index 6c32835..dd789cf 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
@@ -2,15 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
- org.osgi.framework;version="[1.3.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.osgi.framework;version="[1.3.0,2.0.0)",
+ org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
Service-Component: OSGI-INF/indexDomainModelReferenceConverter.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
index e2c384e..d0b2762 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emfforms</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/src/org/eclipse/emfforms/internal/core/services/databinding/index/IndexDomainModelReferenceConverter.java b/bundles/org.eclipse.emfforms.core.services.databinding.index/src/org/eclipse/emfforms/internal/core/services/databinding/index/IndexDomainModelReferenceConverter.java
index aa52a68..1fa8506 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/src/org/eclipse/emfforms/internal/core/services/databinding/index/IndexDomainModelReferenceConverter.java
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/src/org/eclipse/emfforms/internal/core/services/databinding/index/IndexDomainModelReferenceConverter.java
@@ -31,6 +31,8 @@
import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Deactivate;
/**
* An implementation of {@link DomainModelReferenceConverterEMF} that converts {@link VIndexDomainModelReference
@@ -43,6 +45,7 @@
public class IndexDomainModelReferenceConverter implements DomainModelReferenceConverterEMF {
private EMFFormsDatabindingEMF emfFormsDatabinding;
private ServiceReference<EMFFormsDatabindingEMF> databindingServiceReference;
+ private BundleContext bundleContext;
/**
* Sets the {@link EMFFormsDatabindingEMF}.
@@ -66,14 +69,9 @@
*
* @param bundleContext The {@link BundleContext} of this classes bundle.
*/
+ @Activate
protected final void activate(BundleContext bundleContext) {
- databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
- if (databindingServiceReference == null) {
- throw new IllegalStateException(
- "The org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF Service is not available!"); //$NON-NLS-1$
- }
- setEMFFormsDatabinding(bundleContext.getService(databindingServiceReference));
-
+ this.bundleContext = bundleContext;
}
/**
@@ -82,9 +80,23 @@
*
* @param bundleContext The {@link BundleContext} of this classes bundle.
*/
+ @Deactivate
protected final void deactivate(BundleContext bundleContext) {
- unsetEMFFormsDatabinding();
- bundleContext.ungetService(databindingServiceReference);
+ if (databindingServiceReference != null) {
+ bundleContext.ungetService(databindingServiceReference);
+ unsetEMFFormsDatabinding();
+ }
+ }
+
+ private EMFFormsDatabindingEMF getEMFFormsDatabindingEMF() {
+ if (emfFormsDatabinding == null) {
+ databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
+ if (databindingServiceReference == null) {
+ throw new IllegalStateException("No EMFFormsDatabindingEMF available!"); //$NON-NLS-1$
+ }
+ setEMFFormsDatabinding(bundleContext.getService(databindingServiceReference));
+ }
+ return emfFormsDatabinding;
}
/**
@@ -124,7 +136,8 @@
final IEMFValueProperty valueProperty;
if (indexReference.getPrefixDMR() != null) {
- final IEMFValueProperty prefixProperty = emfFormsDatabinding.getValueProperty(indexReference.getPrefixDMR(),
+ final IEMFValueProperty prefixProperty = getEMFFormsDatabindingEMF().getValueProperty(
+ indexReference.getPrefixDMR(),
object);
valueProperty = new EMFValuePropertyDecorator(new EMFIndexedValuePropertyDelegator(getEditingDomain(object),
indexReference.getIndex(), prefixProperty, prefixProperty.getStructuralFeature()),
@@ -155,7 +168,7 @@
valueProperty = emfValueProperty.value(indexedValueProperty);
}
}
- return valueProperty.value(emfFormsDatabinding.getValueProperty(indexReference.getTargetDMR(), object));
+ return valueProperty.value(getEMFFormsDatabindingEMF().getValueProperty(indexReference.getTargetDMR(), object));
}
/**
@@ -179,7 +192,8 @@
IEMFValueProperty valueProperty;
if (indexReference.getPrefixDMR() != null) {
- final IEMFValueProperty prefixProperty = emfFormsDatabinding.getValueProperty(indexReference.getPrefixDMR(),
+ final IEMFValueProperty prefixProperty = getEMFFormsDatabindingEMF().getValueProperty(
+ indexReference.getPrefixDMR(),
object);
valueProperty = new EMFValuePropertyDecorator(
new EMFIndexedValuePropertyDelegator(getEditingDomain(object), indexReference.getIndex(),
@@ -213,7 +227,7 @@
}
}
- return valueProperty.list(emfFormsDatabinding.getListProperty(indexReference.getTargetDMR(), object));
+ return valueProperty.list(getEMFFormsDatabindingEMF().getListProperty(indexReference.getTargetDMR(), object));
}
/**
@@ -274,7 +288,7 @@
}
eList = (EList<EObject>) currentObject.eGet(indexDMR.getDomainModelEFeature());
} else {
- final Setting setting = emfFormsDatabinding.getSetting(indexDMR.getPrefixDMR(), object);
+ final Setting setting = getEMFFormsDatabindingEMF().getSetting(indexDMR.getPrefixDMR(), object);
eList = (EList<EObject>) setting.get(true);
}
if (eList.isEmpty()) {
@@ -282,6 +296,6 @@
"The list used by the index dmr mustr must not be empty."); //$NON-NLS-1$
}
final EObject eObject = eList.get(indexDMR.getIndex());
- return emfFormsDatabinding.getSetting(indexDMR.getTargetDMR(), eObject);
+ return getEMFFormsDatabindingEMF().getSetting(indexDMR.getTargetDMR(), eObject);
}
}
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
index a065077..0858043 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Keyattribute DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/KeyAttributeDomainModelReferenceConverter.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
index 6ef9692..125917b 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.databinding.keyattribute</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
index 96769a5..ba85d11 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
- org.osgi.framework;version="[1.3.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.osgi.framework;version="[1.3.0,2.0.0)",
+ org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
Service-Component: OSGI-INF/mappingDomainModelReferenceConverter.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
index faf52d9..dcbd515 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emfforms</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/src/org/eclipse/emfforms/internal/core/services/databinding/mapping/MappingDomainModelReferenceConverter.java b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/src/org/eclipse/emfforms/internal/core/services/databinding/mapping/MappingDomainModelReferenceConverter.java
index 32580ee..17718bd 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/src/org/eclipse/emfforms/internal/core/services/databinding/mapping/MappingDomainModelReferenceConverter.java
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/src/org/eclipse/emfforms/internal/core/services/databinding/mapping/MappingDomainModelReferenceConverter.java
@@ -34,6 +34,8 @@
import org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Deactivate;
/**
* Implementation of {@link DomainModelReferenceConverterEMF} that converts {@link VMappingDomainModelReference
@@ -46,6 +48,7 @@
public class MappingDomainModelReferenceConverter implements DomainModelReferenceConverterEMF {
private EMFFormsDatabindingEMF emfFormsDatabinding;
private ServiceReference<EMFFormsDatabindingEMF> databindingServiceReference;
+ private BundleContext bundleContext;
/**
* Sets the {@link EMFFormsDatabindingEMF}.
@@ -69,10 +72,9 @@
*
* @param bundleContext The {@link BundleContext} of this classes bundle.
*/
+ @Activate
protected final void activate(BundleContext bundleContext) {
- databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
- setEMFFormsDatabinding(bundleContext.getService(databindingServiceReference));
-
+ this.bundleContext = bundleContext;
}
/**
@@ -81,9 +83,23 @@
*
* @param bundleContext The {@link BundleContext} of this classes bundle.
*/
+ @Deactivate
protected final void deactivate(BundleContext bundleContext) {
- unsetEMFFormsDatabinding();
- bundleContext.ungetService(databindingServiceReference);
+ if (databindingServiceReference != null) {
+ bundleContext.ungetService(databindingServiceReference);
+ unsetEMFFormsDatabinding();
+ }
+ }
+
+ private EMFFormsDatabindingEMF getEMFFormsDatabindingEMF() {
+ if (emfFormsDatabinding == null) {
+ databindingServiceReference = bundleContext.getServiceReference(EMFFormsDatabindingEMF.class);
+ if (databindingServiceReference == null) {
+ throw new IllegalStateException("No EMFFormsDatabindingEMF available!"); //$NON-NLS-1$
+ }
+ setEMFFormsDatabinding(bundleContext.getService(databindingServiceReference));
+ }
+ return emfFormsDatabinding;
}
/**
@@ -147,8 +163,9 @@
valueProperty = emfValueProperty.value(mappingValueProperty);
}
- return valueProperty.value(emfFormsDatabinding.getValueProperty(mappingReference.getDomainModelReference(),
- object));
+ return valueProperty
+ .value(getEMFFormsDatabindingEMF().getValueProperty(mappingReference.getDomainModelReference(),
+ object));
}
/**
@@ -197,8 +214,9 @@
valueProperty = emfValueProperty.value(mappingValueProperty);
}
- return valueProperty.list(emfFormsDatabinding.getListProperty(mappingReference.getDomainModelReference(),
- object));
+ return valueProperty
+ .list(getEMFFormsDatabindingEMF().getListProperty(mappingReference.getDomainModelReference(),
+ object));
}
/**
@@ -233,7 +251,7 @@
/**
* Checks basic required properties of the given {@link EStructuralFeature}.
- *
+ *
* @param structuralFeature The {@link EStructuralFeature} to check
* @throws IllegalMapTypeException if something's wrong with the feature
*/
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
index 537e8ca..b88e1c2 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default Domain Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.service.component.annotations;version="0.0.0"
Service-Component: OSGI-INF/EMFFormsDomainExpanderDefaultHeuristic.xml,OSGI-INF/EMFFormsDomainExpanderImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
index 4b731e2..8b0ce4b 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.default</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java
index 608288c..cc86000 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/src/org/eclipse/emfforms/internal/core/services/domainexpander/defaultheuristic/EMFFormsDMRExpanderDefaultHeuristic.java
@@ -42,7 +42,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
@@ -68,8 +68,8 @@
"The domain model feature of the given feature path DMR must not be null."); //$NON-NLS-1$
}
EObject currentResolvedEObject = domainObject;
- final ArrayList<EReference> currentLeftReferences = new
- ArrayList<EReference>(featurePathDMR.getDomainModelEReferencePath());
+ final ArrayList<EReference> currentLeftReferences = new ArrayList<EReference>(
+ featurePathDMR.getDomainModelEReferencePath());
for (final EReference eReference : featurePathDMR.getDomainModelEReferencePath()) {
if (!currentResolvedEObject.eClass().getEAllReferences().contains(eReference)) {
throw new EMFFormsExpandingFailedException(
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
index aa6d1c2..2f66228 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/OSGI-INF/EMFFormsIndexDMRExpander.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/OSGI-INF/EMFFormsIndexDMRExpander.xml
index 32247bd..3a1b51d 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/OSGI-INF/EMFFormsIndexDMRExpander.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/OSGI-INF/EMFFormsIndexDMRExpander.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/core/services/domainexpander/index/EMFFormsIndexDMRExpander.java]-->
-<scr:component name="EMFFormsIndexDMRExpander" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <service>
- <provide interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDMRExpander"/>
- </service>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
- <reference name="EMFFormsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" bind="setEMFFormsDatabinding"/>
- <implementation class="org.eclipse.emfforms.internal.core.services.domainexpander.index.EMFFormsIndexDMRExpander"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="EMFFormsIndexDMRExpander">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDMRExpander"/>
+ </service>
+ <reference bind="setEMFFormsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" name="EMFFormsDatabinding"/>
+ <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+ <implementation class="org.eclipse.emfforms.internal.core.services.domainexpander.index.EMFFormsIndexDMRExpander"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
index 9337139..f8a0ba8 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.index</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/src/org/eclipse/emfforms/internal/core/services/domainexpander/index/EMFFormsIndexDMRExpander.java b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/src/org/eclipse/emfforms/internal/core/services/domainexpander/index/EMFFormsIndexDMRExpander.java
index afac601..a34e2c0 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/src/org/eclipse/emfforms/internal/core/services/domainexpander/index/EMFFormsIndexDMRExpander.java
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/src/org/eclipse/emfforms/internal/core/services/domainexpander/index/EMFFormsIndexDMRExpander.java
@@ -58,7 +58,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
@@ -112,7 +112,7 @@
*
* @param emfFormsDatabinding The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding emfFormsDatabinding) {
databindingService = emfFormsDatabinding;
}
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
index 21db9db..686c0be 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute DMR Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/OSGI-INF/EMFFormsKeyAttributeDMRExpander.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/OSGI-INF/EMFFormsKeyAttributeDMRExpander.xml
index c82e2bc..dfc412e 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/OSGI-INF/EMFFormsKeyAttributeDMRExpander.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/OSGI-INF/EMFFormsKeyAttributeDMRExpander.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/core/services/domainexpander/keyattribute/EMFFormsKeyAttributeDMRExpander.java]-->
-<scr:component name="EMFFormsKeyAttributeDMRExpander" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <service>
- <provide interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDMRExpander"/>
- </service>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
- <reference name="EMFFormsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" bind="setEMFFormsDatabinding"/>
- <implementation class="org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute.EMFFormsKeyAttributeDMRExpander"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="EMFFormsKeyAttributeDMRExpander">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDMRExpander"/>
+ </service>
+ <reference bind="setEMFFormsDatabinding" cardinality="1..1" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" name="EMFFormsDatabinding" policy="static"/>
+ <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+ <implementation class="org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute.EMFFormsKeyAttributeDMRExpander"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
index a0f03f4..6fb8a46 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.keyattribute</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/src/org/eclipse/emfforms/internal/core/services/domainexpander/keyattribute/EMFFormsKeyAttributeDMRExpander.java b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/src/org/eclipse/emfforms/internal/core/services/domainexpander/keyattribute/EMFFormsKeyAttributeDMRExpander.java
index 843c9f1..43f2da6 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/src/org/eclipse/emfforms/internal/core/services/domainexpander/keyattribute/EMFFormsKeyAttributeDMRExpander.java
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/src/org/eclipse/emfforms/internal/core/services/domainexpander/keyattribute/EMFFormsKeyAttributeDMRExpander.java
@@ -56,7 +56,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
@@ -110,7 +110,7 @@
*
* @param emfFormsDatabinding The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding emfFormsDatabinding) {
databindingService = emfFormsDatabinding;
}
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..f1a0b6d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=ignore
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
index 61ac648..39dc99f 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
index 86a42c4..0cd3ac4 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.mapping</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/src/org/eclipse/emfforms/internal/core/services/domainexpander/mapping/EMFFormsMappingDMRExpander.java b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/src/org/eclipse/emfforms/internal/core/services/domainexpander/mapping/EMFFormsMappingDMRExpander.java
index d5a0787..b972f6f 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/src/org/eclipse/emfforms/internal/core/services/domainexpander/mapping/EMFFormsMappingDMRExpander.java
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/src/org/eclipse/emfforms/internal/core/services/domainexpander/mapping/EMFFormsMappingDMRExpander.java
@@ -53,7 +53,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
index 0ec9c2e..0b78d9c 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms TableControl Domain Expander
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.table
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/OSGI-INF/EMFFormsTableDMRExpander.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/OSGI-INF/EMFFormsTableDMRExpander.xml
index fd83284..a6dafe2 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/OSGI-INF/EMFFormsTableDMRExpander.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/OSGI-INF/EMFFormsTableDMRExpander.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/core/services/domainexpander/table/EMFFormsTableDMRExpander.java]-->
-<scr:component name="EMFFormsTableDMRExpander" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <service>
- <provide interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDMRExpander"/>
- </service>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
- <reference name="EMFFormsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" bind="setEMFFormsDatabinding"/>
- <implementation class="org.eclipse.emfforms.internal.core.services.domainexpander.table.EMFFormsTableDMRExpander"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="EMFFormsTableDMRExpander">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDMRExpander"/>
+ </service>
+ <reference bind="setEMFFormsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" name="EMFFormsDatabinding"/>
+ <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+ <implementation class="org.eclipse.emfforms.internal.core.services.domainexpander.table.EMFFormsTableDMRExpander"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
index 352a4af..2f71df6 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.table</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/src/org/eclipse/emfforms/internal/core/services/domainexpander/table/EMFFormsTableDMRExpander.java b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/src/org/eclipse/emfforms/internal/core/services/domainexpander/table/EMFFormsTableDMRExpander.java
index c0a19b8..563c7ac 100644
--- a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/src/org/eclipse/emfforms/internal/core/services/domainexpander/table/EMFFormsTableDMRExpander.java
+++ b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/src/org/eclipse/emfforms/internal/core/services/domainexpander/table/EMFFormsTableDMRExpander.java
@@ -52,7 +52,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
@@ -106,7 +106,7 @@
*
* @param emfFormsDatabinding The {@link EMFFormsDatabinding}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding emfFormsDatabinding) {
this.emfFormsDatabinding = emfFormsDatabinding;
}
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
index 512ab35..ffafed5 100644
--- a/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Edit Support
Bundle-SymbolicName: org.eclipse.emfforms.core.services.editsupport
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.editsupport;version="1.9.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.editsupport;version="1.10.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.localization;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.10.0,2.0.0)"
Service-Component: OSGI-INF/emfFormsEditSupport.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml b/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
index 4d8da40..66c9c77 100644
--- a/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.editsupport/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emfforms</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/src/org/eclipse/emfforms/internal/core/services/editsupport/EMFFormsEditSupportImpl.java b/bundles/org.eclipse.emfforms.core.services.editsupport/src/org/eclipse/emfforms/internal/core/services/editsupport/EMFFormsEditSupportImpl.java
index 37a4def..b4a19cd 100644
--- a/bundles/org.eclipse.emfforms.core.services.editsupport/src/org/eclipse/emfforms/internal/core/services/editsupport/EMFFormsEditSupportImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services.editsupport/src/org/eclipse/emfforms/internal/core/services/editsupport/EMFFormsEditSupportImpl.java
@@ -14,7 +14,7 @@
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
@@ -200,12 +200,12 @@
private static final String LITERAL_NAME = "_UI_%1$s_%2$s_literal"; //$NON-NLS-1$
private String getEnumLiteral(EStructuralFeature feature, Object element) {
- final EClass eContainingClass = feature.getEContainingClass();
+ final EClassifier featureType = feature.getEType();
Bundle bundle;
try {
- bundle = bundleResolver.getEditBundle(eContainingClass);
- final String key = String.format(LITERAL_NAME, feature.getEType().getName(),
- EEnum.class.cast(feature.getEType()).getEEnumLiteralByLiteral(
+ bundle = bundleResolver.getEditBundle(featureType);
+ final String key = String.format(LITERAL_NAME, featureType.getName(),
+ EEnum.class.cast(featureType).getEEnumLiteralByLiteral(
Enum.class.cast(element).toString()).getName());
return emfFormsLocalizationService.getString(bundle, key);
} catch (final NoBundleFoundException ex) {
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
index 8d69e54..40e58ce 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services EMF
Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
@@ -17,13 +17,13 @@
org.eclipse.core.databinding.observable.value;version="0.0.0",
org.eclipse.core.runtime;version="0.0.0",
org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.common.locale;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.localization;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.6.0,2.0.0)"
Service-Component: OSGI-INF/emfLabelProvider.xml, OSGI-INF/emfLabelProviderDefault.xml, OSGI-INF/databindingService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/pom.xml b/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
index 44c3126..bf9d5c1 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.emf/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.emf</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolver.java b/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolver.java
index 5deb400..f0ed868 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolver.java
+++ b/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolver.java
@@ -11,11 +11,11 @@
******************************************************************************/
package org.eclipse.emfforms.internal.core.services.label;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
import org.osgi.framework.Bundle;
/**
- * Class to resolve an EClass to a Bundle.
+ * Class to resolve an EClassifier to a Bundle.
*
* @author Eugen Neufeld
*
@@ -34,19 +34,19 @@
/**
* Default Constructor.
*
- * @param eClass The EClass to log for.
+ * @param eClassifier The EClassifier to log for.
*/
- public NoBundleFoundException(EClass eClass) {
- super(String.format("No Bundle could not be found for %1$s.", eClass.getName())); //$NON-NLS-1$
+ public NoBundleFoundException(EClassifier eClassifier) {
+ super(String.format("No Bundle could not be found for %1$s.", eClassifier.getName())); //$NON-NLS-1$
}
}
/**
- * Retrieve the edit bundle for the passed EClass.
+ * Retrieve the edit bundle for the passed EClassifier.
*
- * @param eClass The EClass to get the edit bundle for
+ * @param eClassifier The EClassifier to get the edit bundle for
* @return the Bundle , never null
* @throws NoBundleFoundException if no bundle could be found
*/
- Bundle getEditBundle(EClass eClass) throws NoBundleFoundException;
+ Bundle getEditBundle(EClassifier eClassifier) throws NoBundleFoundException;
}
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolverImpl.java b/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolverImpl.java
index d1cb4d4..32107d1 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolverImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/BundleResolverImpl.java
@@ -15,34 +15,34 @@
import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
import org.osgi.framework.Bundle;
/**
* Implementation of the BundleResolver.
- *
+ *
* @author Eugen Neufeld
*/
public class BundleResolverImpl implements BundleResolver {
/**
* {@inheritDoc}
- *
- * @see org.eclipse.emfforms.internal.core.services.label.BundleResolver#getEditBundle(org.eclipse.emf.ecore.EClass)
+ *
+ * @see org.eclipse.emfforms.internal.core.services.label.BundleResolver#getEditBundle(org.eclipse.emf.ecore.EClassifier)
*/
@Override
- public Bundle getEditBundle(EClass eClass) throws NoBundleFoundException {
+ public Bundle getEditBundle(EClassifier eClassifier) throws NoBundleFoundException {
final IExtensionPoint extensionPoint = Platform.getExtensionRegistry()
.getExtensionPoint("org.eclipse.emf.edit.itemProviderAdapterFactories"); //$NON-NLS-1$
for (final IExtension extension : extensionPoint.getExtensions()) {
for (final IConfigurationElement configurationElement : extension.getConfigurationElements()) {
- if (configurationElement.getAttribute("uri").equals(eClass.getEPackage().getNsURI())) { //$NON-NLS-1$
+ if (configurationElement.getAttribute("uri").equals(eClassifier.getEPackage().getNsURI())) { //$NON-NLS-1$
return Platform.getBundle(configurationElement.getContributor().getName());
}
}
}
- throw new NoBundleFoundException(eClass);
+ throw new NoBundleFoundException(eClassifier);
}
}
diff --git a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
index 28aeaff..9d843e1 100644
--- a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms EMF Specific Service
Bundle-SymbolicName: org.eclipse.emfforms.core.services.emfspecificservice
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.9.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.10.0"
Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/emfSpecificService.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
index 29e216c..39f5cf6 100644
--- a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/src/org/eclipse/emfforms/spi/core/services/emfspecificservice/EMFSpecificService.java b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/src/org/eclipse/emfforms/spi/core/services/emfspecificservice/EMFSpecificService.java
index b19f1ad..21d181c 100644
--- a/bundles/org.eclipse.emfforms.core.services.emfspecificservice/src/org/eclipse/emfforms/spi/core/services/emfspecificservice/EMFSpecificService.java
+++ b/bundles/org.eclipse.emfforms.core.services.emfspecificservice/src/org/eclipse/emfforms/spi/core/services/emfspecificservice/EMFSpecificService.java
@@ -13,16 +13,14 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
/**
* The {@link EMFSpecificService} offers EMF specific functionality. Thereby, it provides the following things:
* <ul>
- * <li>{@link AdapterFactoryItemDelegator}</li>
- * <li>{@link ComposedAdapterFactory}</li>
+ * <li>{@link org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator}</li>
+ * <li>{@link org.eclipse.emf.edit.provider.ComposedAdapterFactory}</li>
* <ul>
*
* @author Lucas Koehler
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
index 57644e8..e663fef 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services Legacy
Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.spi.model;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml b/bundles/org.eclipse.emfforms.core.services.legacy/OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
index 977432c..a56a4d0 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/core/services/legacy/EMFFormsLegacyServicesManagerImpl.java]-->
-<scr:component name="org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <service>
- <provide interface="org.eclipse.emf.ecp.view.spi.context.EMFFormsLegacyServicesManager"/>
- </service>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" cardinality="1..1" policy="static" bind="setReportService" unbind="unsetReportService"/>
- <implementation class="org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl">
+ <service>
+ <provide interface="org.eclipse.emf.ecp.view.spi.context.EMFFormsLegacyServicesManager"/>
+ </service>
+ <reference bind="setReportService" cardinality="1..1" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService" policy="static"/>
+ <implementation class="org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
index 5cc741d..6eaf0b5 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/src/org/eclipse/emfforms/internal/core/services/legacy/EMFFormsLegacyServicesManagerImpl.java b/bundles/org.eclipse.emfforms.core.services.legacy/src/org/eclipse/emfforms/internal/core/services/legacy/EMFFormsLegacyServicesManagerImpl.java
index b9b739c..33ee3f5 100644
--- a/bundles/org.eclipse.emfforms.core.services.legacy/src/org/eclipse/emfforms/internal/core/services/legacy/EMFFormsLegacyServicesManagerImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services.legacy/src/org/eclipse/emfforms/internal/core/services/legacy/EMFFormsLegacyServicesManagerImpl.java
@@ -54,20 +54,12 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY, policy = ReferencePolicy.STATIC)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, policy = ReferencePolicy.STATIC, unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
- /**
- * Called by OSGi to unset the {@link ReportService}.
- *
- * @param reportService The {@link ReportService}
- */
- protected void unsetReportService(ReportService reportService) {
- this.reportService = null;
- }
-
+
/**
* Called by OSGi when the component is ready to be activated.
*
diff --git a/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
index f081a3c..4b0b0c5 100644
--- a/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Default Locale Provider
Bundle-SymbolicName: org.eclipse.emfforms.core.services.locale.default
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.9.0"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.10.0"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.10.0,2.0.0)"
Service-Component: OSGI-INF/defaultLocalizationService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
index 32b1ca5..067e198 100644
--- a/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.locale.default/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.locale.default</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
index 812bb5b..73a979c 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Mapping Provider Default Heuristic
Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.default
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.defaultheuristic;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="0.0.0"
Service-Component: OSGI-INF/EMFFormsMappingProviderDefaultHeuristic.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
index 1474fcb..44d7954 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.mappingprovider.default</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/src/org/eclipse/emfforms/internal/core/services/mappingprovider/defaultheuristic/EMFFormsMappingProviderDefaultHeuristic.java b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/src/org/eclipse/emfforms/internal/core/services/mappingprovider/defaultheuristic/EMFFormsMappingProviderDefaultHeuristic.java
index 8f318e6..8b12c18 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/src/org/eclipse/emfforms/internal/core/services/mappingprovider/defaultheuristic/EMFFormsMappingProviderDefaultHeuristic.java
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/src/org/eclipse/emfforms/internal/core/services/mappingprovider/defaultheuristic/EMFFormsMappingProviderDefaultHeuristic.java
@@ -45,7 +45,7 @@
*
* @param emfFormsDatabinding The databinding service
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabindingEMF emfFormsDatabinding) {
this.emfFormsDatabinding = emfFormsDatabinding;
}
@@ -55,7 +55,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
index 8970949..0297dd7 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Mapping Provider Table Control
Bundle-SymbolicName: org.eclipse.emfforms.core.services.mappingprovider.table
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.core.services.mappingprovider.table;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/EMFFormsMappingProviderTable.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
index d8b0811..25cff34 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.mappingprovider.table</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/src/org/eclipse/emfforms/internal/core/services/mappingprovider/table/EMFFormsMappingProviderTable.java b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/src/org/eclipse/emfforms/internal/core/services/mappingprovider/table/EMFFormsMappingProviderTable.java
index dac9b56..d9a4985 100644
--- a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/src/org/eclipse/emfforms/internal/core/services/mappingprovider/table/EMFFormsMappingProviderTable.java
+++ b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/src/org/eclipse/emfforms/internal/core/services/mappingprovider/table/EMFFormsMappingProviderTable.java
@@ -48,7 +48,7 @@
*
* @param emfFormsDatabinding The databinding service
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabindingEMF emfFormsDatabinding) {
this.emfFormsDatabinding = emfFormsDatabinding;
}
@@ -58,7 +58,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
index 5100718..94e1cb2 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Structural Change Tester Default Heuristic
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.default
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.defaultheuristic;version="1.7.0";x-friends:="org.eclipse.emfforms.core.services.structuralchange.table"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.service.component.annotations;version="0.0.0"
Service-Component: OSGI-INF/StructuralChangeTesterDefault.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
index 97269d1..198b909 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.structuralchange.default</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
index 32a6a60..427fbaa 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms StructuralChange Index
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.index
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.index.StructuralChangeTesterIndex.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
index ed2b739..2140619 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.structuralchange.index</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/src/org/eclipse/emfforms/internal/core/services/structuralchange/index/StructuralChangeTesterIndex.java b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/src/org/eclipse/emfforms/internal/core/services/structuralchange/index/StructuralChangeTesterIndex.java
index fc5a88e..9779d0a 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/src/org/eclipse/emfforms/internal/core/services/structuralchange/index/StructuralChangeTesterIndex.java
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/src/org/eclipse/emfforms/internal/core/services/structuralchange/index/StructuralChangeTesterIndex.java
@@ -93,7 +93,7 @@
*
* @param emfFormsDatabinding The emf databinding service
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabindingEMF(EMFFormsDatabindingEMF emfFormsDatabinding) {
this.emfFormsDatabinding = emfFormsDatabinding;
}
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
index c8d45a4..e9d1933 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute Structural Change Tester
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/StructuralChangeTesterKeyAttribute.xml
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
+Service-Component: OSGI-INF/StructuralChangeTesterKeyAttribute.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/OSGI-INF/StructuralChangeTesterKeyAttribute.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/OSGI-INF/StructuralChangeTesterKeyAttribute.xml
index 34c52e5..11c99ce 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/OSGI-INF/StructuralChangeTesterKeyAttribute.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/OSGI-INF/StructuralChangeTesterKeyAttribute.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/core/services/structuralchange/keyattribute/StructuralChangeTesterKeyAttribute.java]-->
-<scr:component name="StructuralChangeTesterKeyAttribute" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <service>
- <provide interface="org.eclipse.emfforms.spi.core.services.structuralchange.StructuralChangeTesterInternal"/>
- </service>
- <reference name="EMFFormsDatabindingEMF" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" bind="setEMFFormsDatabindingEMF" unbind="unsetEMFFormsDatabindingEMF"/>
- <implementation class="org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute.StructuralChangeTesterKeyAttribute"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="StructuralChangeTesterKeyAttribute">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.core.services.structuralchange.StructuralChangeTesterInternal"/>
+ </service>
+ <reference bind="setEMFFormsDatabindingEMF" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" name="EMFFormsDatabindingEMF"/>
+ <implementation class="org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute.StructuralChangeTesterKeyAttribute"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
index d0cc400..86a022f 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.structuralchange.keyattribute</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/src/org/eclipse/emfforms/internal/core/services/structuralchange/keyattribute/StructuralChangeTesterKeyAttribute.java b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/src/org/eclipse/emfforms/internal/core/services/structuralchange/keyattribute/StructuralChangeTesterKeyAttribute.java
index 309f9e1..9c58a8b 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/src/org/eclipse/emfforms/internal/core/services/structuralchange/keyattribute/StructuralChangeTesterKeyAttribute.java
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/src/org/eclipse/emfforms/internal/core/services/structuralchange/keyattribute/StructuralChangeTesterKeyAttribute.java
@@ -50,21 +50,12 @@
*
* @param emfFormsDatabindingEMF The {@link EMFFormsDatabindingEMF} to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabindingEMF(EMFFormsDatabindingEMF emfFormsDatabindingEMF) {
this.emfFormsDatabindingEMF = emfFormsDatabindingEMF;
}
/**
- * Called by the OSGI framework to unset the {@link EMFFormsDatabindingEMF}.
- *
- * @param emfFormsDatabindingEMF The {@link EMFFormsDatabindingEMF} to unset
- */
- protected void unsetEMFFormsDatabindingEMF(EMFFormsDatabindingEMF emfFormsDatabindingEMF) {
- this.emfFormsDatabindingEMF = null;
- }
-
- /**
* Only needed for testing. The {@link EMFFormsStructuralChangeTester} is not set by the OSGI framework.
*
* @param emfFormsStructuralChangeTester The {@link EMFFormsStructuralChangeTester} to set.
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
index 2c7eebf..add380a 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms StructuralChange Mapping
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.mapping
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.structuralchange.mapping.StructuralChangeTesterMapping.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
index bbb6a19..c0e380c 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.structuralchange.mapping</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/src/org/eclipse/emfforms/internal/core/services/structuralchange/mapping/StructuralChangeTesterMapping.java b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/src/org/eclipse/emfforms/internal/core/services/structuralchange/mapping/StructuralChangeTesterMapping.java
index d165c1e..8f0f7e2 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/src/org/eclipse/emfforms/internal/core/services/structuralchange/mapping/StructuralChangeTesterMapping.java
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/src/org/eclipse/emfforms/internal/core/services/structuralchange/mapping/StructuralChangeTesterMapping.java
@@ -137,6 +137,10 @@
final EMap<EClass, EObject> map = (EMap<EClass, EObject>) lastResolvedEObject
.eGet(mappingDMR.getDomainModelEFeature());
+ if (!map.containsKey(mappingDMR.getMappedClass())) {
+ return false;
+ }
+
relevantChange = getEMFFormsStructuralChangeTester().isStructureChanged(mappingDMR.getDomainModelReference(),
map.get(mappingDMR.getMappedClass()),
notification);
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
index 3c01a72..fc6a638 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Structural Change Tester Table
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.table
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.table;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
index 1e9a6b1..6010ca8 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.structuralchange.table</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services.structuralchange/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
index fdcacdc..53ef13c 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Structural Change Tester
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange;version="1.7.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.service.component.annotations;version="0.0.0"
Service-Component: OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange/OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
index fcc5839..b48b243 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/core/services/structuralchange/EMFFormsStructuralChangeTesterImpl.java]-->
-<scr:component name="EMFFormsStructuralChangeTesterImpl" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
- <implementation class="org.eclipse.emfforms.internal.core.services.structuralchange.EMFFormsStructuralChangeTesterImpl"/>
- <service>
- <provide interface="org.eclipse.emfforms.spi.core.services.structuralchange.EMFFormsStructuralChangeTester"/>
- </service>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
- <reference name="StructuralChangeTesterInternal" interface="org.eclipse.emfforms.spi.core.services.structuralchange.StructuralChangeTesterInternal" cardinality="0..n" policy="dynamic" bind="addStructuralChangeTesterInternal" unbind="removeStructuralChangeTesterInternal"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="EMFFormsStructuralChangeTesterImpl">
+ <implementation class="org.eclipse.emfforms.internal.core.services.structuralchange.EMFFormsStructuralChangeTesterImpl"/>
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.core.services.structuralchange.EMFFormsStructuralChangeTester"/>
+ </service>
+ <reference bind="setReportService" cardinality="1..1" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService" policy="static"/>
+ <reference bind="addStructuralChangeTesterInternal" cardinality="0..n" interface="org.eclipse.emfforms.spi.core.services.structuralchange.StructuralChangeTesterInternal" name="StructuralChangeTesterInternal" policy="dynamic" unbind="removeStructuralChangeTesterInternal"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
index ea3799b..7e90a7e 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.structuralchange</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/src/org/eclipse/emfforms/internal/core/services/structuralchange/EMFFormsStructuralChangeTesterImpl.java b/bundles/org.eclipse.emfforms.core.services.structuralchange/src/org/eclipse/emfforms/internal/core/services/structuralchange/EMFFormsStructuralChangeTesterImpl.java
index 304d9af..c19c8a8 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange/src/org/eclipse/emfforms/internal/core/services/structuralchange/EMFFormsStructuralChangeTesterImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange/src/org/eclipse/emfforms/internal/core/services/structuralchange/EMFFormsStructuralChangeTesterImpl.java
@@ -43,7 +43,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emfforms.core.services/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.core.services/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.core.services/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
index c0d6503..bcd3902 100644
--- a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services
Bundle-SymbolicName: org.eclipse.emfforms.core.services
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.controlmapper;version="1.9.0",
- org.eclipse.emfforms.spi.core.services.databinding;version="1.9.0",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="1.9.0",
- org.eclipse.emfforms.spi.core.services.label;version="1.9.0",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.9.0",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="1.9.0",
- org.eclipse.emfforms.spi.core.services.view;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="1.10.0",
+ org.eclipse.emfforms.spi.core.services.databinding;version="1.10.0",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="1.10.0",
+ org.eclipse.emfforms.spi.core.services.label;version="1.10.0",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.10.0",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="1.10.0",
+ org.eclipse.emfforms.spi.core.services.view;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.databinding.observable.list;version="0.0.0",
org.eclipse.core.databinding.observable.value;version="0.0.0",
org.eclipse.core.databinding.property.list;version="0.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emf.ecp.view.spi.model;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.osgi.framework;version="1.8.0",
org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.controlmapper.SettingToControlMapFactoryImpl.xml,OSGI-INF/org.eclipse.emfforms.internal.core.services.mappingprovider.EMFFormsMappingProviderManagerImpl.xml,OSGI-INF/org.eclipse.emfforms.internal.core.services.scoped.EMFFormsViewServiceManagerImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services/pom.xml b/bundles/org.eclipse.emfforms.core.services/pom.xml
index 45ed2e6..cb3bacb 100644
--- a/bundles/org.eclipse.emfforms.core.services/pom.xml
+++ b/bundles/org.eclipse.emfforms.core.services/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapFactoryImpl.java b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapFactoryImpl.java
index 9085a9a..8173068 100644
--- a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapFactoryImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapFactoryImpl.java
@@ -36,7 +36,7 @@
*
* @param mappingManager The {@link EMFFormsMappingProviderManager}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsMappingProviderManager(EMFFormsMappingProviderManager mappingManager) {
this.mappingManager = mappingManager;
}
@@ -88,7 +88,8 @@
*/
@Override
public EMFFormsSettingToControlMapper createService(EMFFormsViewContext emfFormsViewContext) {
- final EMFFormsSettingToControlMapper mapper = new SettingToControlMapperImpl(mappingManager, emfFormsViewContext);
+ final EMFFormsSettingToControlMapper mapper = new SettingToControlMapperImpl(mappingManager,
+ emfFormsViewContext);
return mapper;
}
diff --git a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/mappingprovider/EMFFormsMappingProviderManagerImpl.java b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/mappingprovider/EMFFormsMappingProviderManagerImpl.java
index 5598a48..b8e27d8 100644
--- a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/mappingprovider/EMFFormsMappingProviderManagerImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/mappingprovider/EMFFormsMappingProviderManagerImpl.java
@@ -62,7 +62,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.editor.ecore/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.ecore/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
index d5b0aea..9f42c75 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
@@ -2,47 +2,44 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ecore Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.actions;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.controls;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.actions;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.106.0,4.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,1.4.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="1.9.0",
- org.eclipse.emfforms.editor.ecore;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.editor.ecore;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="1.9.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.9.0,2.0.0)";resolution:=optional,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.10.0,2.0.0)";resolution:=optional,
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
-Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,
- OSGI-INF/dataTypeControlService.xml,
- OSGI-INF/eenumLiteralControlService.xml,
- OSGI-INF/org.eclipse.emfforms.internal.editor.ecore.controls.LinkOnlyMultiReferenceRendererService.xml,
- OSGI-INF/typedElementBoundsControlService.xml
+Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,OSGI-INF/dataTypeControlService.xml,OSGI-INF/eenumLiteralControlService.xml,OSGI-INF/org.eclipse.emfforms.internal.editor.ecore.controls.LinkOnlyMultiReferenceRendererService.xml,OSGI-INF/typedElementBoundsControlService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
index 85e86f2..7fec8be 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.editor.ecore</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreDiagnosticCache.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreDiagnosticCache.java
new file mode 100644
index 0000000..0108064
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreDiagnosticCache.java
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.ecore;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
+
+/**
+ * {@link DiagnosticCache} for ecore.
+ */
+public class EcoreDiagnosticCache extends DiagnosticCache {
+
+ /**
+ * @param input the input
+ */
+ public EcoreDiagnosticCache(Notifier input) {
+ super(input);
+ }
+
+ @Override
+ protected void updateCache(EObject element, DiagnosticCache cache) {
+ super.updateCache(element, cache);
+ final EObject parent = element.eContainer();
+ if (parent != null) {
+ updateCache(parent, cache);
+ }
+ }
+
+ @Override
+ protected void updateCacheWithoutRefresh(EObject element, DiagnosticCache cache) {
+ super.updateCacheWithoutRefresh(element, cache);
+ final EObject parent = element.eContainer();
+ if (parent != null) {
+ updateCacheWithoutRefresh(parent, cache);
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditor.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditor.java
index 91532cf..874d35a 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditor.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditor.java
@@ -16,6 +16,7 @@
import org.eclipse.emfforms.spi.editor.InitializeChildCallback;
import org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailComposite;
import org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailSWTFactory;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
import org.eclipse.emfforms.spi.swt.treemasterdetail.util.CreateElementCallback;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
@@ -41,11 +42,22 @@
protected TreeMasterDetailComposite createTreeMasterDetail(Composite composite, Object editorInput,
CreateElementCallback createElementCallback) {
return TreeMasterDetailSWTFactory.createTreeMasterDetail(composite, SWT.NONE, editorInput,
- new EcoreEditorTMDCustomization(createElementCallback, (Notifier) editorInput));
+ new EcoreEditorTMDCustomization(createElementCallback, (Notifier) editorInput,
+ (EcoreDiagnosticCache) getDiagnosticCache()));
+ }
+
+ @Override
+ protected DiagnosticCache createDiangosticCache(Notifier input) {
+ return new EcoreDiagnosticCache(input);
}
@Override
protected String getContextId() {
return ECORE_EDITOR_CONTEXT;
}
+
+ @Override
+ protected boolean enableValidation() {
+ return true;
+ }
}
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditorTMDCustomization.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditorTMDCustomization.java
index 5c756c9..ac2cd73 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditorTMDCustomization.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreEditorTMDCustomization.java
@@ -28,6 +28,7 @@
import org.eclipse.emfforms.spi.swt.treemasterdetail.ViewModelServiceProvider;
import org.eclipse.emfforms.spi.swt.treemasterdetail.actions.ActionCollector;
import org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp.ECPValidationLabelDecoratorProvider;
import org.eclipse.emfforms.spi.swt.treemasterdetail.util.CreateElementCallback;
import org.eclipse.emfforms.spi.swt.treemasterdetail.util.RootObject;
import org.eclipse.jface.action.MenuManager;
@@ -49,8 +50,11 @@
*
* @param createElementCallback the {@link CreateElementCallback}
* @param notifier The Notifier to create the customization for
+ * @param diagnosticCache the {@link org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache
+ * DiagnosticCache}
*/
- public EcoreEditorTMDCustomization(final CreateElementCallback createElementCallback, Notifier notifier) {
+ public EcoreEditorTMDCustomization(final CreateElementCallback createElementCallback, Notifier notifier,
+ EcoreDiagnosticCache diagnosticCache) {
setMenu(new MenuProvider() {
@Override
public Menu getMenu(TreeViewer treeViewer, EditingDomain editingDomain) {
@@ -75,7 +79,7 @@
}
});
- setLabelDecorator(new EcoreValidationLabelDecoratorProvider(notifier));
+ setLabelDecorator(new ECPValidationLabelDecoratorProvider(notifier, diagnosticCache));
}
@Override
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreValidationLabelDecoratorProvider.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreValidationLabelDecoratorProvider.java
deleted file mode 100644
index b7159a6..0000000
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreValidationLabelDecoratorProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eugen Neufeld - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emfforms.internal.editor.ecore;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emfforms.common.Optional;
-import org.eclipse.emfforms.spi.swt.treemasterdetail.LabelDecoratorProvider;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.TreeViewer;
-
-/**
- * An Ecore LabelDecoratorProvider.
- *
- * @author Eugen Neufeld
- *
- */
-public class EcoreValidationLabelDecoratorProvider implements LabelDecoratorProvider {
-
- private final Notifier input;
- private EcoreValidationServiceLabelDecorator decorator;
-
- /**
- * Default constructor.
- *
- * @param input the notifier which we will display the diagnostics
- */
- public EcoreValidationLabelDecoratorProvider(Notifier input) {
- this.input = input;
- }
-
- @Override
- public Optional<ILabelDecorator> getLabelDecorator(TreeViewer viewer) {
- decorator = new EcoreValidationServiceLabelDecorator(viewer, input);
- return Optional.<ILabelDecorator> of(decorator);
- }
-
- @SuppressWarnings("restriction")
- @Override
- public void dispose() {
- decorator.dispose();
- }
-
-}
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreValidationServiceLabelDecorator.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreValidationServiceLabelDecorator.java
deleted file mode 100644
index dc48d40..0000000
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/EcoreValidationServiceLabelDecorator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eugen Neufeld - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emfforms.internal.editor.ecore;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp.DiagnosticCache;
-import org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp.ECPValidationServiceLabelDecorator;
-import org.eclipse.jface.viewers.TreeViewer;
-
-/**
- * EcoreValidationServiceLabelDecorator validates always all containers of a changed element, too.
- *
- * @author Eugen Neufeld
- *
- */
-@SuppressWarnings("restriction")
-public class EcoreValidationServiceLabelDecorator extends ECPValidationServiceLabelDecorator {
-
- /**
- * Default constructor.
- *
- * @param viewer the {@link TreeViewer}
- * @param input the input notifier
- */
- public EcoreValidationServiceLabelDecorator(TreeViewer viewer, Notifier input) {
- super(viewer, input);
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp.ECPValidationServiceLabelDecorator#updateCache(org.eclipse.emf.ecore.EObject,
- * org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp.DiagnosticCache)
- */
- @Override
- protected void updateCache(EObject element, DiagnosticCache cache) {
- super.updateCache(element, cache);
- final EObject parent = element.eContainer();
- if (parent != null) {
- updateCache(parent, cache);
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp.ECPValidationServiceLabelDecorator#updateCacheWithoutRefresh(org.eclipse.emf.ecore.EObject,
- * org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp.DiagnosticCache)
- */
- @Override
- protected void updateCacheWithoutRefresh(EObject element, DiagnosticCache cache) {
- super.updateCacheWithoutRefresh(element, cache);
- final EObject parent = element.eContainer();
- if (parent != null) {
- updateCacheWithoutRefresh(parent, cache);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/actions/CreateNewInstanceAction.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/actions/CreateNewInstanceAction.java
index f6f98d7..a8be869 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/actions/CreateNewInstanceAction.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/actions/CreateNewInstanceAction.java
@@ -11,6 +11,8 @@
******************************************************************************/
package org.eclipse.emfforms.internal.editor.ecore.actions;
+import java.util.List;
+
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IStatus;
@@ -42,33 +44,23 @@
setImagePath(ICON_PATH);
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- */
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
return null;
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction#shouldShow(org.eclipse.emf.ecore.EObject)
- */
@Override
- public boolean shouldShow(EObject eObject) {
+ public boolean shouldShow(List<Object> objects) {
+ if (objects.size() != 1 && !EObject.class.isInstance(objects.get(0))) {
+ return false;
+ }
+ final EObject eObject = EObject.class.cast(objects.get(0));
return EClass.class.isInstance(eObject);
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction#execute(org.eclipse.emf.ecore.EObject)
- */
@Override
- public void execute(EObject object) {
+ public void execute(List<Object> objects) {
+ final EObject object = EObject.class.cast(objects.get(0));
final EClass eClass = EClass.class.cast(object);
final Diagnostic validate = Diagnostician.INSTANCE.validate(eClass);
if (validate.getSeverity() == Diagnostic.OK) {
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/InstanceTypeNameSWTRendererService.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/InstanceTypeNameSWTRendererService.java
index b5276c7..6185070 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/InstanceTypeNameSWTRendererService.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/InstanceTypeNameSWTRendererService.java
@@ -43,7 +43,7 @@
*
* @param databindingService The EMFFormsDatabinding
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -53,7 +53,7 @@
*
* @param reportService The ReportService
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/LinkOnlyMultiReferenceRendererService.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/LinkOnlyMultiReferenceRendererService.java
index f648498..a2402e9 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/LinkOnlyMultiReferenceRendererService.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/controls/LinkOnlyMultiReferenceRendererService.java
@@ -43,7 +43,7 @@
*
* @param databindingService The EMFFormsDatabinding
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -53,7 +53,7 @@
*
* @param reportService The ReportService
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/referenceservices/EcoreReferenceService.java b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/referenceservices/EcoreReferenceService.java
index 053463a..4a53ef7 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/referenceservices/EcoreReferenceService.java
+++ b/bundles/org.eclipse.emfforms.editor.ecore/src/org/eclipse/emfforms/internal/editor/ecore/referenceservices/EcoreReferenceService.java
@@ -14,7 +14,9 @@
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -25,18 +27,13 @@
import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecp.internal.edit.ECPControlHelper;
+import org.eclipse.emf.ecp.spi.common.ui.SelectModelElementWizardFactory;
import org.eclipse.emf.ecp.ui.view.swt.DefaultReferenceService;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.emfforms.spi.editor.helpers.ResourceSetHelpers;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.dialogs.ListDialog;
/**
* The ReferenceService provides all widgets with Ecore specific references.
@@ -99,28 +96,13 @@
}
// Let the user select an item from a List using a dialog
- private EObject select(List<?> elements, String title, String message) {
- final ListDialog dialog = new ListDialog(Display.getDefault()
- .getActiveShell());
- dialog.setTitle(title);
- dialog.setMessage(message);
- dialog.setInput(elements);
-
- dialog.setContentProvider(new ArrayContentProvider());
-
- final ComposedAdapterFactory composedAdapterFactory = new ComposedAdapterFactory(
- ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
- final AdapterFactoryLabelProvider labelProvider = new AdapterFactoryLabelProvider(composedAdapterFactory);
-
- dialog.setLabelProvider(labelProvider);
-
- final int result = dialog.open();
- if (result == Window.OK && dialog.getResult().length > 0) {
- return (EObject) dialog.getResult()[0];
+ private EObject select(List<? extends EObject> elements, String title, String message) {
+ final Set<EObject> selectedEObjects = SelectModelElementWizardFactory
+ .openModelElementSelectionDialog(new LinkedHashSet<EObject>(elements), false);
+ if (selectedEObjects.isEmpty()) {
+ return null;
}
- return null;
-
+ return selectedEObjects.iterator().next();
}
private EObject getExistingElementFor(EReference eReference) {
@@ -169,8 +151,9 @@
"Select the opposite EReference");
}
+ @SuppressWarnings("unchecked")
private EObject getExistingGenericType(EReference eReference) {
- final List<?> classes = ResourceSetHelpers
+ final List<EObject> classes = (List<EObject>) ResourceSetHelpers
.findAllOfTypeInResourceSet(context.getDomainModel(),
eReference.getEReferenceType(), false);
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EOperation.view b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EOperation.view
index 882ebd3..21c23b1 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EOperation.view
+++ b/bundles/org.eclipse.emfforms.editor.ecore/viewmodels/EOperation.view
@@ -34,16 +34,6 @@
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/unique"/>
</domainModelReference>
</children>
- <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_vSEHnnZeEeW79bHa435byw" name="Control required">
- <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vSEHn3ZeEeW79bHa435byw">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/required"/>
- </domainModelReference>
- </children>
- <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_vSEHnHZeEeW79bHa435byw" name="Control many">
- <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vSEHnXZeEeW79bHa435byw">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement/many"/>
- </domainModelReference>
- </children>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_vSEHqnZeEeW79bHa435byw" name="Control eExceptions">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_vSEHq3ZeEeW79bHa435byw">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EOperation/eExceptions"/>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.checkstyle b/bundles/org.eclipse.emfforms.editor.genmodel.util/.checkstyle
new file mode 100644
index 0000000..19c5477
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+ <file-match-pattern match-pattern=".java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.classpath b/bundles/org.eclipse.emfforms.editor.genmodel.util/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.project b/bundles/org.eclipse.emfforms.editor.genmodel.util/.project
new file mode 100644
index 0000000..83a2f2d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.editor.genmodel.util</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..66c53c1
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,419 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8bc4bb4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6df8b20
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMFForms Genmodel Editor Utilities
+Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel.util;singleton:=true
+Bundle-Version: 1.10.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: Eclipse Modeling Project
+Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.5.0,3.0.0)"
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/about.html b/bundles/org.eclipse.emfforms.editor.genmodel.util/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/build.properties b/bundles/org.eclipse.emfforms.editor.genmodel.util/build.properties
new file mode 100644
index 0000000..101ae79
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/build.properties
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ about.html,\
+ plugin.xml
+src.includes = about.html
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/plugin.xml b/bundles/org.eclipse.emfforms.editor.genmodel.util/plugin.xml
new file mode 100644
index 0000000..98f73a6
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/plugin.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ defaultHandler="org.eclipse.emfforms.internal.editor.genmodel.util.handler.AddDescriptionTagHandler"
+ id="org.eclipse.emfforms.editor.genmodel.util.addPropertyDescriptions"
+ name="Add Property Descriptions">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:org.eclipse.jdt.ui.PackageExplorer">
+ <command
+ commandId="org.eclipse.emfforms.editor.genmodel.util.addPropertyDescriptions"
+ label="Add Property Descriptions"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <and>
+ <count
+ value="1">
+ </count>
+ <iterate>
+ <instanceof
+ value="org.eclipse.core.resources.IFile">
+ </instanceof>
+ <test
+ property="org.eclipse.core.resources.name"
+ value="*.genmodel">
+ </test>
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
+ </menuContribution>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
new file mode 100644
index 0000000..d0d6dff
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-bundles-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.emfforms.editor.genmodel.util</artifactId>
+<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/editor/genmodel/util/GenModelUtil.java b/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/editor/genmodel/util/GenModelUtil.java
new file mode 100644
index 0000000..f0c3d31
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/editor/genmodel/util/GenModelUtil.java
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.editor.genmodel.util;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
+
+/**
+ * Util class for manipulating {@link GenModel GenModels}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public final class GenModelUtil {
+
+ // TODO API: package is set to internal. Adjust this when API is in final state.
+
+ private GenModelUtil() {
+ /* util */
+ }
+
+ /**
+ * Add the given tag as a property description to all GenFeatures, which do not yet have a description.
+ *
+ * @param genModel the {@link GenModel}
+ * @param tag the tag
+ */
+ public static void addDescriptionTags(GenModel genModel, String tag) {
+ genModel.reconcile();
+ for (final GenPackage genPackage : genModel.getGenPackages()) {
+ for (final GenFeature genFeature : genPackage.getAllGenFeatures()) {
+ final String propertyDescription = genFeature.getPropertyDescription();
+ if (propertyDescription != null && !propertyDescription.isEmpty()
+ && !tag.equalsIgnoreCase(propertyDescription)) {
+ /*
+ * non-null, non-empty description which is not equal to the tag
+ * -> don't override
+ */
+ continue;
+ }
+ genFeature.setPropertyDescription(tag);
+ }
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/internal/editor/genmodel/util/Activator.java b/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/internal/editor/genmodel/util/Activator.java
new file mode 100644
index 0000000..b0bbb18
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/internal/editor/genmodel/util/Activator.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.genmodel.util;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle.
+ *
+ * @author Johannes Faltermeier
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ private static final String PLUGIN_ID = "org.eclipse.emfforms.editor.genmodel.util"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance.
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ /**
+ * Logs the given message as an error.
+ *
+ * @param message the error description
+ */
+ public static void log(String message) {
+ getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message));
+ }
+
+ /**
+ * Logs the given message + exception as an error.
+ *
+ * @param message the error description
+ * @param ex the exception
+ */
+ public static void log(String message, Throwable ex) {
+ getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, message, ex));
+
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/internal/editor/genmodel/util/handler/AddDescriptionTagHandler.java b/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/internal/editor/genmodel/util/handler/AddDescriptionTagHandler.java
new file mode 100644
index 0000000..29f1ad1
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/src/org/eclipse/emfforms/internal/editor/genmodel/util/handler/AddDescriptionTagHandler.java
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.genmodel.util.handler;
+
+import java.io.IOException;
+import java.text.MessageFormat;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emfforms.editor.genmodel.util.GenModelUtil;
+import org.eclipse.emfforms.internal.editor.genmodel.util.Activator;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Handler for adding description placeholders to a {@link GenModel}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public class AddDescriptionTagHandler extends AbstractHandler {
+
+ private static final String DESCRIPTION_PLACEHOLDER = "<DESCRIPTION-PLACEHOLDER>"; //$NON-NLS-1$
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ try {
+ final ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+ if (!IStructuredSelection.class.isInstance(currentSelection)) {
+ Activator.log("Unknown selection"); //$NON-NLS-1$
+ return null;
+ }
+ final Object selectedElement = IStructuredSelection.class.cast(currentSelection).getFirstElement();
+ if (!IFile.class.isInstance(selectedElement)) {
+ Activator.log("Selection is not a file"); //$NON-NLS-1$
+ return null;
+ }
+ final IFile file = IFile.class.cast(selectedElement);
+ final URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), false);
+ final ResourceSet resourceSet = new ResourceSetImpl();
+ final Resource resource = resourceSet.createResource(uri);
+ resource.load(null);
+ if (resource.getContents().size() != 1) {
+ Activator.log("Multiple contents detected"); //$NON-NLS-1$
+ return null;
+ }
+ final EObject resourceContents = resource.getContents().get(0);
+ if (!GenModel.class.isInstance(resourceContents)) {
+ Activator.log("Selection is not a genmodel"); //$NON-NLS-1$
+ return null;
+ }
+ final GenModel genModel = GenModel.class.cast(resourceContents);
+ GenModelUtil.addDescriptionTags(genModel, DESCRIPTION_PLACEHOLDER);
+ for (final Resource r : resourceSet.getResources()) {
+ try {
+ r.save(null);
+ } catch (final IOException ex) {
+ Activator.log(MessageFormat.format("Could not save resource with URI {0}.", resource.getURI()), ex); //$NON-NLS-1$
+ }
+ }
+ } catch (final IOException ex) {
+ Activator.log("Could not load GenModel", ex); //$NON-NLS-1$
+ }
+ return null;
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
index e0344d6..5d7adb5 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
@@ -2,20 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: GenModel Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emfforms.internal.editor.genmodel.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.9.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
- org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.10.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
+ org.eclipse.emfforms.internal.editor.genmodel.service;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.10.0,3.0.0)",
org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)"
+ org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.runtime;version="3.4.0"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
index d6a4552..aded88c 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.editor.genmodel</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java
index beab771..1b7aa80 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditor.java
@@ -9,13 +9,20 @@
* Contributors:
* Clemens Elflein - initial API and implementation
* Johannes Faltermeier - reconcile genmodel
+ * Martin Fleck - bug 495190: add tree-master-detail customization
******************************************************************************/
package org.eclipse.emfforms.internal.editor.genmodel;
import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
+import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emfforms.spi.editor.GenericEditor;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailComposite;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailSWTFactory;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.util.CreateElementCallback;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
/**
* The Genmodel Editor.
@@ -40,4 +47,18 @@
}
return super.modifyEditorInput(resourceSet);
}
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.editor.GenericEditor#createTreeMasterDetail(org.eclipse.swt.widgets.Composite,
+ * java.lang.Object, org.eclipse.emfforms.spi.swt.treemasterdetail.util.CreateElementCallback)
+ */
+ @Override
+ protected TreeMasterDetailComposite createTreeMasterDetail(Composite composite, Object editorInput,
+ CreateElementCallback createElementCallback) {
+ return TreeMasterDetailSWTFactory.createTreeMasterDetail(composite, SWT.NONE, editorInput,
+ new GenModelEditorTMDCustomization(createElementCallback, (Notifier) editorInput));
+ }
+
}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditorTMDCustomization.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditorTMDCustomization.java
new file mode 100644
index 0000000..2b3d48d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/GenModelEditorTMDCustomization.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Martin Fleck - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.genmodel;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelService;
+import org.eclipse.emf.ecp.view.spi.model.VView;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emfforms.internal.editor.genmodel.service.GenModelGroupExpansionViewModelService;
+import org.eclipse.emfforms.internal.editor.genmodel.service.GenModelReadonlyViewModelService;
+import org.eclipse.emfforms.internal.swt.treemasterdetail.DefaultTreeMasterDetailCustomization;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.ViewModelServiceProvider;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.util.CreateElementCallback;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.widgets.Menu;
+
+/**
+ * GenModel Editor-specific customization for the {@link org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailComposite TreeMasterDetailComposite}.
+ *
+ * @author Martin Fleck
+ */
+@SuppressWarnings("restriction")
+public class GenModelEditorTMDCustomization extends DefaultTreeMasterDetailCustomization {
+
+ /**
+ * Constructs a new {@link GenModelEditorTMDCustomization}.
+ *
+ * @param createElementCallback the {@link CreateElementCallback}
+ * @param notifier The editor input that is being customized
+ */
+ public GenModelEditorTMDCustomization(final CreateElementCallback createElementCallback, Notifier notifier) {
+ setViewModelServices(new ViewModelServiceProvider() {
+ @Override
+ public ViewModelService[] getViewModelServices(VView view, EObject eObject) {
+ return new ViewModelService[] { new GenModelGroupExpansionViewModelService(),
+ new GenModelReadonlyViewModelService() };
+ }
+ });
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.internal.swt.treemasterdetail.DefaultTreeViewerCustomization#getMenu(org.eclipse.jface.viewers.TreeViewer,
+ * org.eclipse.emf.edit.domain.EditingDomain)
+ */
+ @Override
+ public Menu getMenu(TreeViewer treeViewer, EditingDomain editingDomain) {
+ // menu not necessary: no cut/copy/paste-action, no EObject-specific actions
+ return null;
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelGroupExpansionViewModelService.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelGroupExpansionViewModelService.java
new file mode 100644
index 0000000..96af7a2
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelGroupExpansionViewModelService.java
@@ -0,0 +1,143 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Martin Fleck - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.genmodel.service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelService;
+import org.eclipse.emf.ecp.view.spi.group.model.VGroup;
+import org.eclipse.emf.ecp.view.spi.group.model.VGroupPackage;
+import org.eclipse.emf.ecp.view.spi.model.ModelChangeListener;
+import org.eclipse.emf.ecp.view.spi.model.ModelChangeNotification;
+import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VView;
+
+/**
+ * This {@link ViewModelService} tracks the collapsed state of the groups used in {@link ViewModelContext#getViewModel()
+ * view model} of the {@link org.eclipse.emfforms.internal.editor.genmodel.GenModelEditor GenModelEditor}. The group state is stored statically so it is the same across all input
+ * models.
+ *
+ * @author Martin Fleck
+ *
+ */
+public class GenModelGroupExpansionViewModelService implements ViewModelService {
+
+ // known group names of the Ecore visible through the GenModel editor
+ private static final String ECORE_STANDARD = "Standard";
+ private static final String ECORE_ADVANCED = "Advanced";
+
+ // known group names of the GenModel visible through the GenModel editor
+ private static final String GENMODEL_ALL = "All";
+ private static final String GENMODEL_EDIT = "Edit";
+ private static final String GENMODEL_EDITOR = "Editor";
+ private static final String GENMODEL_MODEL = "Model";
+ private static final String GENMODEL_MODEL_CLASS_DEFAULTS = "Model Class Defaults";
+ private static final String GENMODEL_MODEL_FEATURE_DEFAULTS = "Model Feature Defaults";
+ private static final String GENMODEL_PACKAGE_SUFFIXES = "Package Suffixes";
+ private static final String GENMODEL_TEMPLATES_MERGE = "Templates & Merge";
+ private static final String GENMODEL_TESTS = "Tests";
+
+ /**
+ * Map storing the collapsed group states by group name.
+ */
+ private static final Map<String, Boolean> GROUP_COLLAPSED_STATES = new HashMap<String, Boolean>();
+ static {
+ // initialize default collapsed states
+ GROUP_COLLAPSED_STATES.put(ECORE_STANDARD, Boolean.FALSE);
+ GROUP_COLLAPSED_STATES.put(ECORE_ADVANCED, Boolean.FALSE);
+
+ GROUP_COLLAPSED_STATES.put(GENMODEL_ALL, Boolean.FALSE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_EDIT, Boolean.TRUE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_EDITOR, Boolean.TRUE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_MODEL, Boolean.TRUE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_MODEL_CLASS_DEFAULTS, Boolean.TRUE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_MODEL_FEATURE_DEFAULTS, Boolean.TRUE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_PACKAGE_SUFFIXES, Boolean.TRUE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_TEMPLATES_MERGE, Boolean.TRUE);
+ GROUP_COLLAPSED_STATES.put(GENMODEL_TESTS, Boolean.TRUE);
+ }
+
+ /**
+ * Context.
+ */
+ private ViewModelContext viewModelContext;
+
+ /**
+ * Listener updating the stored group states.
+ */
+ private final ModelChangeListener collapsedStateListener = new ModelChangeListener() {
+ @Override
+ public void notifyChange(ModelChangeNotification notification) {
+ if (notification.getNotifier() instanceof VGroup
+ && notification.getStructuralFeature().equals(VGroupPackage.Literals.GROUP__COLLAPSED)) {
+ // update collapsed state
+ final VGroup group = (VGroup) notification.getNotifier();
+ GROUP_COLLAPSED_STATES.put(group.getName(), group.isCollapsed());
+ }
+ }
+ };
+
+ /**
+ * {@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) {
+ final VElement viewModel = context.getViewModel();
+ if (!(viewModel instanceof VView)) {
+ return; // this service only works on views
+ }
+
+ final VView view = (VView) viewModel;
+ viewModelContext = context;
+
+ // Set the groups' collapsed states to the stored states (default or set by the user)
+ for (final VContainedElement element : view.getChildren()) {
+ if (element instanceof VGroup) {
+ final VGroup group = (VGroup) element;
+ final Boolean groupCollapsedState = GROUP_COLLAPSED_STATES.get(group.getName());
+ if (groupCollapsedState != null) {
+ group.setCollapsed(groupCollapsedState);
+ }
+ }
+ }
+
+ // register listener
+ context.registerViewChangeListener(collapsedStateListener);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.context.ViewModelService#dispose()
+ */
+ @Override
+ public void dispose() {
+ if (viewModelContext != null) {
+ viewModelContext.unregisterViewChangeListener(collapsedStateListener);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.context.ViewModelService#getPriority()
+ */
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelReadonlyViewModelService.java b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelReadonlyViewModelService.java
new file mode 100644
index 0000000..4c5694e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/src/org/eclipse/emfforms/internal/editor/genmodel/service/GenModelReadonlyViewModelService.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Martin Fleck - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.editor.genmodel.service;
+
+import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelService;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VView;
+
+/**
+ * This {@link ViewModelService} sets all views not related to the {@link GenModelPackage} to read-only.
+ * This avoids, for instance, that the user can make changes to the referenced Ecore model shown in the GenModel editor.
+ *
+ * @author Martin Fleck
+ *
+ */
+public class GenModelReadonlyViewModelService implements ViewModelService {
+
+ /**
+ * {@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) {
+ final VElement viewModel = context.getViewModel();
+ if (!(viewModel instanceof VView)) {
+ return; // this service only works on views
+ }
+
+ final VView view = (VView) viewModel;
+ if (!GenModelPackage.eNS_URI.equals(view.getRootEClass().getEPackage().getNsURI())) {
+ view.setReadonly(true);
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.context.ViewModelService#dispose()
+ */
+ @Override
+ public void dispose() {
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.context.ViewModelService#getPriority()
+ */
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view
index 99cbf0d..521cad2 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/viewmodels/GenDataType.view
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/170" ecorePath="/org.eclipse.emf.codegen.ecore/model/GenModel.ecore">
<rootEClass href="http://www.eclipse.org/emf/2002/GenModel#//GenDataType"/>
- <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ecoreDataType">
+ <children xsi:type="org.eclipse.emf.ecp.view.model:Control" name="Control ecoreDataType" readonly="true">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/GenModel#//GenDataType/ecoreDataType"/>
</domainModelReference>
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
index f91b394..f2c2623 100644
--- a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
@@ -2,20 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewModel Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.viewmodel;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
+Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.jface.action;version="0.0.0",
@@ -32,3 +34,4 @@
org.eclipse.ui;ui.workbench=split;version="0.0.0",
org.eclipse.ui.part;ui.workbench=split;version="0.0.0",
org.eclipse.ui.plugin;version="0.0.0"
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
index df0aa29..b0eb0cb 100644
--- a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.editor.viewmodel</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.editor/.project b/bundles/org.eclipse.emfforms.editor/.project
index a1762dd..6c918ca 100644
--- a/bundles/org.eclipse.emfforms.editor/.project
+++ b/bundles/org.eclipse.emfforms.editor/.project
@@ -30,10 +30,16 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
index 550fd24..8750cea 100644
--- a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
@@ -2,33 +2,34 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emfforms.internal.editor.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.handlers;version="1.9.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.editor.toolbaractions;version="1.9.0";;x-internal:=true;x-internal:=true,
- org.eclipse.emfforms.internal.editor.ui;version="1.9.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.spi.editor;version="1.9.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.9.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel"
+Export-Package: org.eclipse.emfforms.internal.editor;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.handlers;version="1.10.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.editor.toolbaractions;version="1.10.0";;x-internal:=true;x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ui;version="1.10.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.spi.editor;version="1.10.0",
+ org.eclipse.emfforms.spi.editor.handler;version="1.10.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.10.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.codegen.ecore;bundle-version="[2.10.0,3.0.0)",
org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor/pom.xml b/bundles/org.eclipse.emfforms.editor/pom.xml
index 366fa51..95eaa9b 100644
--- a/bundles/org.eclipse.emfforms.editor/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.editor</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/handlers/ShortcutHandler.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/handlers/ShortcutHandler.java
index de1414e..db10d93 100644
--- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/handlers/ShortcutHandler.java
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/handlers/ShortcutHandler.java
@@ -15,17 +15,24 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.command.DeleteCommand;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.internal.editor.ui.CreateNewChildDialog;
+import org.eclipse.emfforms.spi.editor.handler.DeleteShortCutHandler;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.handlers.HandlerUtil;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
/**
* The ShorcutHandler receives the shortcuts defined in plugin.xml and passes them to the editor.
@@ -62,8 +69,7 @@
.getEditingDomainFor(currentSelection);
if (getDeleteCmdName().equals(commandName)) {
- editingDomain.getCommandStack().execute(
- DeleteCommand.create(editingDomain, sSelection.toList()));
+ performDelete(sSelection, editingDomain);
} else if (getNewChildCmdName().equals(commandName)) {
createNewElementDialog(editingDomain, editor.getEditorSite().getSelectionProvider(), currentSelection,
"Create Child").open();
@@ -78,6 +84,34 @@
return null;
}
+ @SuppressWarnings("unchecked")
+ private void performDelete(final StructuredSelection sSelection, final EditingDomain editingDomain) {
+ final Optional<DeleteShortCutHandler> deleteHandler = getDeleteHandler();
+ if (deleteHandler.isPresent()) {
+ deleteHandler.get().handleDeleteShortcut(sSelection.toList());
+ return;
+ }
+ final Command command = DeleteCommand.create(editingDomain, sSelection.toList());
+ if (!command.canExecute()) {
+ return;
+ }
+ editingDomain.getCommandStack().execute(command);
+ }
+
+ private Optional<DeleteShortCutHandler> getDeleteHandler() {
+ final Bundle bundle = FrameworkUtil.getBundle(ShortcutHandler.class);
+ final BundleContext bundleContext = bundle.getBundleContext();
+ final ServiceReference<DeleteShortCutHandler> serviceReference = bundleContext
+ .getServiceReference(DeleteShortCutHandler.class);
+ if (serviceReference == null) {
+ return Optional.empty();
+ }
+ final DeleteShortCutHandler service = bundleContext.getService(serviceReference);
+ final Optional<DeleteShortCutHandler> result = Optional.ofNullable(service);
+ bundleContext.ungetService(serviceReference);
+ return result;
+ }
+
/**
* @return the cmd name for new siblings
*/
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/toolbaractions/LoadEcoreAction.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/toolbaractions/LoadEcoreAction.java
index be9275d..ef1544d 100644
--- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/toolbaractions/LoadEcoreAction.java
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/internal/editor/toolbaractions/LoadEcoreAction.java
@@ -72,7 +72,17 @@
* @param currentObject the currently loaded object in the Editor (should be ResourceSet)
*/
public LoadEcoreAction(Object currentObject) {
- super("Load Ecore");
+ this(currentObject, "Load Ecore");
+ }
+
+ /**
+ * Creates a new LoadEcoreAction.
+ *
+ * @param currentObject the currently loaded object in the Editor (should be ResourceSet)
+ * @param actionName The name of the action
+ */
+ public LoadEcoreAction(Object currentObject, String actionName) {
+ super(actionName);
setImageDescriptor(ImageDescriptor.createFromURL(FrameworkUtil.getBundle(this.getClass())
.getResource("icons/chart_organisation_add.png")));
this.currentObject = currentObject;
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
index 86c1b8c..90be0e4 100644
--- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/GenericEditor.java
@@ -8,17 +8,22 @@
*
* Contributors:
* Clemens Elflein - initial API and implementation
+ * Johannes Faltermeier - initial API and implementation
******************************************************************************/
package org.eclipse.emfforms.spi.editor;
import java.io.IOException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.EventObject;
import java.util.LinkedList;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.resources.IResourceChangeListener;
@@ -26,6 +31,7 @@
import org.eclipse.core.resources.IResourceDeltaVisitor;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.IPath;
@@ -33,15 +39,23 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobFunction;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.common.command.BasicCommandStack;
import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.ui.MarkerHelper;
+import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecp.common.spi.ChildrenDescriptorCollector;
import org.eclipse.emf.ecp.view.spi.model.reporting.StatusReport;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
+import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.internal.editor.Activator;
import org.eclipse.emfforms.internal.editor.toolbaractions.LoadEcoreAction;
import org.eclipse.emfforms.internal.editor.ui.EditorToolBar;
@@ -53,6 +67,8 @@
import org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailSWTFactory;
import org.eclipse.emfforms.spi.swt.treemasterdetail.actions.ActionCollector;
import org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache.ValidationListener;
import org.eclipse.emfforms.spi.swt.treemasterdetail.util.CreateElementCallback;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.MenuManager;
@@ -73,18 +89,24 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IURIEditorInput;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.contexts.IContextService;
import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.ide.IGotoMarker;
import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.FileEditorInput;
/**
* The Class GenericEditor it is the generic part for editing any EObject.
*/
-public class GenericEditor extends EditorPart implements IEditingDomainProvider {
+public class GenericEditor extends EditorPart implements IEditingDomainProvider, IGotoMarker {
+
+ private static final String FRAGMENT_URI = "FRAGMENT_URI";
+
+ private static final String RESOURCE_URI = "RESOURCE_URI";
private static final String ITOOLBAR_ACTIONS_ID = "org.eclipse.emfforms.editor.toolbarActions";
@@ -101,57 +123,59 @@
* True, if there were changes in the filesystem while the editor was in the background and the changes could not be
* applied to current view.
*/
+
private boolean filesChangedWithConflict;
- private final IPartListener partListener = new IPartListener() {
- @Override
- public void partOpened(IWorkbenchPart part) {
- }
+ private final IPartListener partListener = new GenericEditorActivationListener();
- @Override
- public void partDeactivated(IWorkbenchPart part) {
- }
+ private final IResourceChangeListener resourceChangeListener = new GenericEditorResourceChangeListener();
- @Override
- public void partClosed(IWorkbenchPart part) {
- }
+ private final MarkerHelper markerHelper = new GenericEditorMarkerHelper();
- @Override
- public void partBroughtToTop(IWorkbenchPart part) {
- }
+ private final List<Job> markerJobs = new CopyOnWriteArrayList<Job>();
- @Override
- public void partActivated(IWorkbenchPart part) {
- if (part == GenericEditor.this && isDirty() && filesChangedWithConflict && discardChanges()) {
- for (final Resource r : resourceSet.getResources()) {
- r.unload();
- try {
- r.load(null);
- } catch (final IOException e) {
- }
- }
- }
- }
- };
+ private DiagnosticCache cache;
- private final IResourceChangeListener resourceChangeListener = new EcoreResourceChangeListener();
+ private boolean reloading;
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
+ /**
+ * @return the {@link DiagnosticCache}. may be <code>null</code>
+ * @since 1.10
*/
+ protected DiagnosticCache getDiagnosticCache() {
+ return cache;
+ }
+
@Override
public void doSave(IProgressMonitor monitor) {
// Remove the Listener, so that we won't get a changed notification for our own save operation
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+ preSave();
if (ResourceSetHelpers.save(resourceSet)) {
// Tell the CommandStack, that we have saved the file successfully
// and inform the Workspace, that the Dirty property has changed.
- commandStack.saveIsDone();
+ getCommandStack().saveIsDone();
firePropertyChange(PROP_DIRTY);
filesChangedWithConflict = false;
}
// Add the listener again, so that we get notifications for future changes
+ postSave();
+ }
+
+ /**
+ * Executes the code which needs to be executed before a save, e.g. removing listeners.
+ *
+ * @since 1.10
+ */
+ protected void preSave() {
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+ }
+
+ /**
+ * Executes the code which needs to be executed after a save, e.g. readding listeners.
+ *
+ * @since 1.10
+ */
+ protected void postSave() {
ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener);
}
@@ -163,8 +187,11 @@
*/
protected void handleResourceChange(Collection<Resource> changedResources, Collection<Resource> removedResources) {
if (!isDirty()) {
+ if (resourceSet == null || rootView.isDisposed()) {
+ return;
+ }
+ reloading = true;
resourceSet.getResources().removeAll(removedResources);
-
for (final Resource changed : changedResources) {
changed.unload();
try {
@@ -172,6 +199,10 @@
} catch (final IOException ex) {
}
}
+ rootView.getSelectionProvider().refresh();
+ reloading = false;
+ getCommandStack().flush();
+ initMarkers();
} else {
filesChangedWithConflict = true;
}
@@ -182,10 +213,6 @@
"The currently opened files were changed. Do you want to discard the changes and reload the file?");
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.part.EditorPart#doSaveAs()
- */
@Override
public void doSaveAs() {
final SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
@@ -199,10 +226,6 @@
}
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
- */
@Override
public void init(IEditorSite site, IEditorInput input)
throws PartInitException {
@@ -214,7 +237,7 @@
// As soon as the resource changed, we inform the Workspace, that it is
// now dirty
- commandStack.addCommandStackListener(new CommandStackListener() {
+ getCommandStack().addCommandStackListener(new CommandStackListener() {
@Override
public void commandStackChanged(EventObject event) {
GenericEditor.this.firePropertyChange(PROP_DIRTY);
@@ -239,28 +262,16 @@
return "org.eclipse.emfforms.editor.context";
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.part.EditorPart#isDirty()
- */
@Override
public boolean isDirty() {
- return commandStack.isSaveNeeded();
+ return getCommandStack().isSaveNeeded();
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
- */
@Override
public boolean isSaveAsAllowed() {
return true;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createPartControl(Composite parent) {
// Load the resource from the provided input and display the editor
@@ -268,14 +279,112 @@
parent.setBackground(new Color(Display.getCurrent(), 255, 255, 255));
parent.setBackgroundMode(SWT.INHERIT_FORCE);
- rootView = createRootView(parent, getEditorTitle(), modifyEditorInput(resourceSet), getToolbarActions(),
+ final Object editorInput = modifyEditorInput(resourceSet);
+ if (enableValidation()) {
+ setupDiagnosticCache(editorInput);
+ getDiagnosticCache().registerValidationListener(new MarkerValidationListener());
+ }
+ rootView = createRootView(parent, getEditorTitle(), editorInput, getToolbarActions(),
getCreateElementCallback());
+ initMarkers();
+
// We need to set the selectionProvider for the editor, so that the EditingDomainActionBarContributor
// knows the currently selected object to copy/paste
getEditorSite().setSelectionProvider(rootView.getSelectionProvider());
}
+ private synchronized void initMarkers() {
+ if (getDiagnosticCache() == null || reloading) {
+ return;
+ }
+ if (markerJobs.size() > 1) {
+ /* we already enqueued an update job which is not running yet */
+ return;
+ }
+ final Job job = Job.create("Add GenericEditor validation markers.", new IJobFunction() {
+
+ @Override
+ public IStatus run(IProgressMonitor monitor) {
+ try {
+ adjustMarkers(monitor);
+ return Status.OK_STATUS;
+ } catch (final CoreException ex) {
+ return new Status(IStatus.ERROR, "org.eclipse.emfforms.editor", ex.getMessage(), ex);
+ } finally {
+ markerJobs.remove(0);
+ }
+ }
+ });
+ job.setPriority(Job.SHORT);
+ markerJobs.add(job);
+ job.schedule();
+ }
+
+ private synchronized void adjustMarkers(IProgressMonitor monitor) throws CoreException {
+ if (monitor.isCanceled() || reloading) {
+ return;
+ }
+ deleteMarkers();
+ for (final Object o : getDiagnosticCache().getObjects()) {
+ try {
+ if (monitor.isCanceled() || reloading) {
+ return;
+ }
+ final Diagnostic value = getDiagnosticCache().getOwnValue(o);
+ if (value.getSeverity() < Diagnostic.WARNING) {
+ continue;
+ }
+ markerHelper.createMarkers(value);
+ } catch (final CoreException ex) {
+ /* silent */
+ }
+ }
+ }
+
+ /**
+ * Deletes the problem markers created by this Editor. <b>Please take care that this method should be called from a
+ * {@link Job}</b> to avoid problems with a locked index.
+ *
+ * @throws CoreException if the method fails
+ * @since 1.10
+ */
+ protected void deleteMarkers() throws CoreException {
+ final Optional<IFile> file = getFile();
+ if (!file.isPresent()) {
+ return;
+ }
+ file.get().deleteMarkers("org.eclipse.core.resources.problemmarker", false,
+ IResource.DEPTH_ZERO);
+ }
+
+ private void setupDiagnosticCache(Object editorInput) {
+ if (!Notifier.class.isInstance(editorInput)) {
+ return;
+ }
+ final Notifier input = (Notifier) editorInput;
+ cache = createDiangosticCache(input);
+ }
+
+ /**
+ * Creates the diagnostic cache.
+ *
+ * @param input the input
+ * @return the cache
+ * @since 1.10
+ */
+ protected DiagnosticCache createDiangosticCache(final Notifier input) {
+ return new DiagnosticCache(input);
+ }
+
+ /**
+ * @return whether a diagnostic cache should be managed.
+ * @since 1.10
+ */
+ protected boolean enableValidation() {
+ return false;
+ }
+
private TreeMasterDetailComposite createRootView(Composite parent, String editorTitle, Object editorInput,
List<Action> toolbarActions, CreateElementCallback createElementCallback) {
final Composite composite = new Composite(parent, SWT.NONE);
@@ -309,8 +418,10 @@
*
* @return the {@link TreeMasterDetailComposite}
*/
- protected TreeMasterDetailComposite createTreeMasterDetail(final Composite composite,
- Object editorInput, final CreateElementCallback createElementCallback) {
+ protected TreeMasterDetailComposite createTreeMasterDetail(
+ final Composite composite,
+ Object editorInput,
+ final CreateElementCallback createElementCallback) {
final TreeMasterDetailComposite treeMasterDetail = TreeMasterDetailSWTFactory
.fillDefaults(composite, SWT.NONE, editorInput)
.customizeCildCreation(createElementCallback)
@@ -351,16 +462,11 @@
* @return the resource set
*/
protected ResourceSet loadResource(IEditorInput editorInput) {
- final FileEditorInput fei = (FileEditorInput) editorInput;
- return ResourceSetHelpers.loadResourceSetWithProxies(
- URI.createPlatformResourceURI(fei.getFile().getFullPath().toOSString(), false),
- commandStack);
+ final IURIEditorInput uei = (IURIEditorInput) editorInput;
+ return ResourceSetHelpers.loadResourceSetWithProxies(URI.createURI(uei.getURI().toString(), false),
+ getCommandStack());
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
- */
@Override
public void setFocus() {
// NOOP
@@ -409,8 +515,9 @@
* Returns the toolbar actions for this editor.
*
* @return A list of actions to show in the Editor's Toolbar
+ * @since 1.10
*/
- private List<Action> getToolbarActions() {
+ protected List<Action> getToolbarActions() {
final List<Action> result = new LinkedList<Action>();
result.add(new LoadEcoreAction(resourceSet));
@@ -423,8 +530,9 @@
* Read toolbar actions from all extensions.
*
* @return the Actions registered via extension point
+ * @since 1.10
*/
- private List<Action> readToolbarActions() {
+ protected List<Action> readToolbarActions() {
final List<Action> result = new LinkedList<Action>();
final ISelectionProvider selectionProvider = new ISelectionProvider() {
@@ -482,10 +590,196 @@
}
/**
- * The EcoreResourceChangeListener listens for changes in currently opened Ecore files and reports
+ * Returns the ResouceSet of this Editor.
+ *
+ * @return The resource set
+ */
+ public ResourceSet getResourceSet() {
+ return resourceSet;
+ }
+
+ @Override
+ public void dispose() {
+ if (getDiagnosticCache() != null) {
+ getDiagnosticCache().dispose();
+ }
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+ super.dispose();
+ }
+
+ private Optional<IFile> getFile() {
+ final IEditorInput input = GenericEditor.this.getEditorInput();
+ if (IFileEditorInput.class.isInstance(input)) {
+ return Optional.of(IFileEditorInput.class.cast(input).getFile());
+ }
+ return Optional.empty();
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.ui.ide.IGotoMarker#gotoMarker(org.eclipse.core.resources.IMarker)
+ * @since 1.10
+ */
+ @Override
+ public void gotoMarker(IMarker marker) {
+ try {
+ final String resourceURI = (String) marker.getAttribute(RESOURCE_URI);
+ final String fragmentURI = (String) marker.getAttribute(FRAGMENT_URI);
+ if (resourceURI == null || fragmentURI == null) {
+ return;
+ }
+ final Resource resource = getEditingDomain().getResourceSet().getResource(URI.createURI(resourceURI), true);
+ final EObject eObject = resource.getEObject(fragmentURI);
+ if (eObject == null) {
+ return;
+ }
+ reveal(eObject);
+ } catch (final CoreException ex) {
+ // silent
+ }
+ }
+
+ /**
+ * The given element will be revealed in the tree of the editor.
+ *
+ * @param objectToReveal the object to reveal
+ * @since 1.10
+ */
+ public void reveal(EObject objectToReveal) {
+ while (objectToReveal != null && rootView.getSelectionProvider().testFindItem(objectToReveal) == null) {
+ objectToReveal = objectToReveal.eContainer();
+ }
+ if (objectToReveal == null) {
+ return;
+ }
+ rootView.getSelectionProvider().refresh();
+ rootView.getSelectionProvider().reveal(objectToReveal);
+ rootView.setSelection(new StructuredSelection(objectToReveal));
+ }
+
+ /**
+ * @return the commandStack the {@link
+ * import org.eclipse.emf.common.command.CommandStack;}
+ * @since 1.10
+ */
+ protected BasicCommandStack getCommandStack() {
+ return commandStack;
+ }
+
+ /**
+ * Override this method to set additional attributes on the given {@link IMarker}, e.g. location information.
+ *
+ * @param marker the {@link IMarker} to adjust
+ * @param diagnostic the {@link Diagnostic}
+ * @return <code>true</code> if the marker was changed, <code>false</code> otherwise
+ * @throws CoreException in case of an error
+ * @since 1.10
+ */
+ protected boolean adjustErrorMarker(IMarker marker, Diagnostic diagnostic) throws CoreException {
+ final List<?> data = diagnostic.getData();
+ if (data.size() < 1) {
+ return false;
+ }
+ if (!EObject.class.isInstance(data.get(0))) {
+ return false;
+ }
+ final EObject eObject = EObject.class.cast(data.get(0));
+ if (eObject.eResource() == null) {
+ /* possible when job still running but getting closed */
+ return false;
+ }
+ final String uri = eObject.eResource().getURI().toString();
+ final String uriFragment = eObject.eResource().getURIFragment(eObject);
+ marker.setAttribute(RESOURCE_URI, uri);
+ marker.setAttribute(FRAGMENT_URI, uriFragment);
+ return true;
+ }
+
+ /**
+ * Listens to part events.
+ *
+ */
+ private final class GenericEditorActivationListener implements IPartListener {
+ @Override
+ public void partOpened(IWorkbenchPart part) {
+ }
+
+ @Override
+ public void partDeactivated(IWorkbenchPart part) {
+ }
+
+ @Override
+ public void partClosed(IWorkbenchPart part) {
+ }
+
+ @Override
+ public void partBroughtToTop(IWorkbenchPart part) {
+ }
+
+ @Override
+ public void partActivated(IWorkbenchPart part) {
+ if (part == GenericEditor.this && isDirty() && filesChangedWithConflict && discardChanges()) {
+ reloading = true;
+ for (final Resource r : resourceSet.getResources()) {
+ r.unload();
+ try {
+ r.load(null);
+ } catch (final IOException e) {
+ }
+ }
+ rootView.getSelectionProvider().refresh();
+ reloading = false;
+ getCommandStack().flush();
+ initMarkers();
+ firePropertyChange(PROP_DIRTY);
+ filesChangedWithConflict = false;
+ }
+ }
+ }
+
+ /**
+ * Reacts to revalidation changes and creates/removes marker accordingly.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+ private final class MarkerValidationListener implements ValidationListener {
+ @Override
+ public void revalidationOccurred(final Collection<EObject> object, boolean potentialStructuralChange) {
+ initMarkers();
+ }
+ }
+
+ /**
+ * {@link MarkerHelper} for this editor.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+ private final class GenericEditorMarkerHelper extends EditUIMarkerHelper {
+ @Override
+ public IFile getFile(Diagnostic diagnostic) {
+ final Optional<IFile> file = GenericEditor.this.getFile();
+ if (file.isPresent()) {
+ return file.get();
+ }
+ return super.getFile(diagnostic);
+ }
+
+ @Override
+ protected boolean adjustMarker(IMarker marker, Diagnostic diagnostic) throws CoreException {
+ return adjustErrorMarker(marker, diagnostic);
+ }
+ }
+
+ /**
+ * The GenericEditorResourceChangeListener listens for changes in currently opened Ecore files and reports
* them to the EcoreEditor.
*/
- private final class EcoreResourceChangeListener implements IResourceChangeListener {
+ private final class GenericEditorResourceChangeListener implements IResourceChangeListener {
+
@Override
public void resourceChanged(IResourceChangeEvent event) {
final Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -497,43 +791,66 @@
}
try {
- delta.accept(new IResourceDeltaVisitor() {
-
- @Override
- public boolean visit(final IResourceDelta delta) {
- if (delta.getResource().getType() == IResource.FILE
- && (delta.getKind() == IResourceDelta.REMOVED ||
- delta.getKind() == IResourceDelta.CHANGED)) {
- final Resource resource = resourceSet.getResource(
- URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
- if (resource != null) {
- if (delta.getKind() == IResourceDelta.REMOVED) {
- removedResources.add(resource);
- } else {
- changedResources.add(resource);
- }
- }
- return false;
- }
-
- return true;
- }
- });
+ delta.accept(new GenericEditorResourceDeltaVisitor(removedResources, changedResources));
} catch (final CoreException ex) {
Activator.getDefault().getReportService().report(
new StatusReport(new Status(IStatus.ERROR, Activator.PLUGIN_ID, ex.getMessage(), ex)));
}
-
+ if (changedResources.isEmpty() && removedResources.isEmpty()) {
+ return;
+ }
handleResourceChange(changedResources, removedResources);
}
}
/**
- * Returns the ResouceSet of this Editor.
- *
- * @return The resource set
+ * The delata visitor deciding if changes are relevant for reloading.
*/
- public ResourceSet getResourceSet() {
- return resourceSet;
+ private final class GenericEditorResourceDeltaVisitor implements IResourceDeltaVisitor {
+ private final Collection<Resource> removedResources;
+ private final Collection<Resource> changedResources;
+
+ GenericEditorResourceDeltaVisitor(Collection<Resource> removedResources,
+ Collection<Resource> changedResources) {
+ this.removedResources = removedResources;
+ this.changedResources = changedResources;
+ }
+
+ @Override
+ public boolean visit(final IResourceDelta delta) {
+ if ((delta.getFlags() & IResourceDelta.MARKERS) != 0) {
+ return false;
+ }
+ if (delta.getResource().getType() == IResource.FILE
+ && (delta.getKind() == IResourceDelta.REMOVED ||
+ delta.getKind() == IResourceDelta.CHANGED)) {
+ final ResourceSet resourceSet = getResourceSet();
+ if (resourceSet == null) {
+ return false;
+ }
+ Resource resource = null;
+
+ final URI uri = URI.createPlatformResourceURI(delta.getFullPath().toString(), true);
+ resource = resourceSet.getResource(uri, false);
+ if (resource == null) {
+ try {
+ final URL fileURL = FileLocator.resolve(new URL(uri.toString()));
+ resource = resourceSet.getResource(URI.createFileURI(fileURL.getPath()), false);
+ } catch (final IOException ex) {
+ return false;
+ }
+ }
+
+ if (resource != null) {
+ if (delta.getKind() == IResourceDelta.REMOVED) {
+ removedResources.add(resource);
+ } else {
+ changedResources.add(resource);
+ }
+ }
+ return false;
+ }
+ return true;
+ }
}
}
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/handler/DeleteShortCutHandler.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/handler/DeleteShortCutHandler.java
new file mode 100644
index 0000000..d02e82f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/handler/DeleteShortCutHandler.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.editor.handler;
+
+import java.util.List;
+
+/**
+ * This service will be invoked when the delete shortcut was pressed in the
+ * {@link org.eclipse.emfforms.spi.editor.GenericEditor GenericEditor}.
+ *
+ * @author Johannes Faltermeier
+ * @since 1.10
+ */
+public interface DeleteShortCutHandler {
+
+ /**
+ * Performs the deletion.
+ *
+ * @param toDelete the objects to delete
+ */
+ void handleDeleteShortcut(List<Object> toDelete);
+}
diff --git a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/helpers/ResourceSetHelpers.java b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/helpers/ResourceSetHelpers.java
index 20617e7..dec5e78 100644
--- a/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/helpers/ResourceSetHelpers.java
+++ b/bundles/org.eclipse.emfforms.editor/src/org/eclipse/emfforms/spi/editor/helpers/ResourceSetHelpers.java
@@ -19,7 +19,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
import org.eclipse.emf.common.command.BasicCommandStack;
import org.eclipse.emf.common.command.CommandStack;
import org.eclipse.emf.common.notify.AdapterFactory;
@@ -77,13 +76,19 @@
BasicCommandStack commandStack) {
// Create a ResourceSet and add the requested Resource
final ResourceSet resourceSet = createResourceSet(commandStack);
+ return loadResourceWithProxies(resourceURI, resourceSet);
+ }
+
+ /**
+ * Load resource set with proxies.
+ *
+ * @param resourceURI the resource uri (= File to load)
+ * @param resourceSet the resource set
+ * @return the resource set
+ * @since 1.10
+ */
+ public static ResourceSet loadResourceWithProxies(URI resourceURI, final ResourceSet resourceSet) {
if (addResourceToSet(resourceSet, resourceURI)) {
-
- // If the Root is a GenModel, refresh it
- if (resourceSet.getResources().get(0) instanceof GenModel) {
- ((GenModel) resourceSet.getResources().get(0)).reconcile();
- }
-
return resourceSet;
}
return null;
@@ -94,8 +99,9 @@
*
* @param commandStack the command stack
* @return the resource set
+ * @since 1.10
*/
- private static ResourceSet createResourceSet(CommandStack commandStack) {
+ public static ResourceSet createResourceSet(CommandStack commandStack) {
final AdapterFactoryEditingDomain domain = new AdapterFactoryEditingDomain(
new ComposedAdapterFactory(
new AdapterFactory[] {
@@ -118,11 +124,26 @@
*/
public static boolean addResourceToSet(ResourceSet resourceSet,
URI resourceURI) {
- try {
- final Map<Object, Object> loadOptions = new HashMap<Object, Object>();
- loadOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE,
- Boolean.TRUE);
+ final Map<Object, Object> loadOptions = new HashMap<Object, Object>();
+ loadOptions.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE,
+ Boolean.TRUE);
+
+ return addResourceToSet(resourceSet, resourceURI, loadOptions);
+ }
+
+ /**
+ * Loads a resource from resourceURI and adds it to the resourceSet.
+ *
+ * @param resourceSet the resource set
+ * @param resourceURI the resource uri
+ * @param loadOptions the resource load options
+ * @return true, if successful
+ * @since 1.10
+ */
+ public static boolean addResourceToSet(ResourceSet resourceSet, URI resourceURI,
+ final Map<Object, Object> loadOptions) {
+ try {
resourceSet.createResource(resourceURI).load(loadOptions);
// resolve all proxies
diff --git a/bundles/org.eclipse.emfforms.localization/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.localization/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.localization/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
index 593edf8..8f0981e 100644
--- a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Localization
Bundle-SymbolicName: org.eclipse.emfforms.localization
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.localization;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.9.0"
+Export-Package: org.eclipse.emfforms.internal.localization;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.10.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/localizationService.xml
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.osgi.service.localization;version="[1.1.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="1.2.0",
diff --git a/bundles/org.eclipse.emfforms.localization/OSGI-INF/localizationService.xml b/bundles/org.eclipse.emfforms.localization/OSGI-INF/localizationService.xml
index 0be2549..676ae35 100644
--- a/bundles/org.eclipse.emfforms.localization/OSGI-INF/localizationService.xml
+++ b/bundles/org.eclipse.emfforms.localization/OSGI-INF/localizationService.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/localization/EMFFormsLocalizationServiceImpl.java]-->
-<scr:component name="localizationService" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
- <implementation class="org.eclipse.emfforms.internal.localization.EMFFormsLocalizationServiceImpl"/>
- <service>
- <provide interface="org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService"/>
- </service>
- <reference name="EMFFormsLocaleProvider" interface="org.eclipse.emfforms.spi.common.locale.EMFFormsLocaleProvider" cardinality="0..1" policy="dynamic" bind="setEMFFormsLocaleProvider" unbind="unsetEMFFormsLocaleProvider"/>
- <reference name="BundleLocalization" interface="org.eclipse.osgi.service.localization.BundleLocalization" bind="setBundleLocalization"/>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="localizationService">
+ <implementation class="org.eclipse.emfforms.internal.localization.EMFFormsLocalizationServiceImpl"/>
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.localization.EMFFormsLocalizationService"/>
+ </service>
+ <reference bind="setBundleLocalization" interface="org.eclipse.osgi.service.localization.BundleLocalization" name="BundleLocalization"/>
+ <reference bind="setEMFFormsLocaleProvider" cardinality="0..1" interface="org.eclipse.emfforms.spi.common.locale.EMFFormsLocaleProvider" name="EMFFormsLocaleProvider" policy="dynamic" unbind="unsetEMFFormsLocaleProvider"/>
+ <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.localization/pom.xml b/bundles/org.eclipse.emfforms.localization/pom.xml
index f1744df..4ef144d 100644
--- a/bundles/org.eclipse.emfforms.localization/pom.xml
+++ b/bundles/org.eclipse.emfforms.localization/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.localization/src/org/eclipse/emfforms/internal/localization/EMFFormsLocalizationServiceImpl.java b/bundles/org.eclipse.emfforms.localization/src/org/eclipse/emfforms/internal/localization/EMFFormsLocalizationServiceImpl.java
index f8067da..d0a7c0f 100644
--- a/bundles/org.eclipse.emfforms.localization/src/org/eclipse/emfforms/internal/localization/EMFFormsLocalizationServiceImpl.java
+++ b/bundles/org.eclipse.emfforms.localization/src/org/eclipse/emfforms/internal/localization/EMFFormsLocalizationServiceImpl.java
@@ -63,7 +63,7 @@
*
* @param bundleLocalization The {@link BundleLocalization}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setBundleLocalization(BundleLocalization bundleLocalization) {
this.bundleLocalization = bundleLocalization;
}
@@ -73,7 +73,7 @@
*
* @param reportService The {@link ReportService}
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -115,7 +115,8 @@
.report(new AbstractReport(
String
.format(
- "No ResourceBundle found for Language '%1$s' in Bundle %2$s with Version %3$s.", localeLanguage, bundle.getSymbolicName(), bundle.getVersion().toString()))); //$NON-NLS-1$
+ "No ResourceBundle found for Language '%1$s' in Bundle %2$s with Version %3$s.", //$NON-NLS-1$
+ localeLanguage, bundle.getSymbolicName(), bundle.getVersion().toString())));
return key;
}
if (!resourceBundle.containsKey(key)) {
@@ -123,7 +124,8 @@
.report(new AbstractReport(
String
.format(
- "The ResourceBundle for Language '%1$s' in Bundle %2$s with Version %3$s doesn't contain the key '%4$s'.", localeLanguage, bundle.getSymbolicName(), bundle.getVersion().toString(), key))); //$NON-NLS-1$
+ "The ResourceBundle for Language '%1$s' in Bundle %2$s with Version %3$s doesn't contain the key '%4$s'.", //$NON-NLS-1$
+ localeLanguage, bundle.getSymbolicName(), bundle.getVersion().toString(), key)));
return key;
}
return resourceBundle.getString(key);
@@ -157,7 +159,8 @@
.report(new AbstractReport(
String
.format(
- "No ResourceBundle found for Language '%1$s' in Bundle %2$s with Version %3$s.", localeLanguage, bundle.getSymbolicName(), bundle.getVersion().toString()))); //$NON-NLS-1$
+ "No ResourceBundle found for Language '%1$s' in Bundle %2$s with Version %3$s.", //$NON-NLS-1$
+ localeLanguage, bundle.getSymbolicName(), bundle.getVersion().toString())));
return false;
}
return resourceBundle.containsKey(key);
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.checkstyle b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.checkstyle
new file mode 100644
index 0000000..19c5477
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+ <file-match-pattern match-pattern=".java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.classpath b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.classpath
new file mode 100644
index 0000000..121e527
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.project b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.project
new file mode 100644
index 0000000..05600c0
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.rulerepository.model.edit</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..26d14e4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,418 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8553926
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b93b68e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model.edit;singleton:=true
+Bundle-Version: 1.10.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.emfforms.spi.rulerepository.model.provider.RulerepositoryEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/build.properties b/bundles/org.eclipse.emfforms.rulerepository.model.edit/build.properties
new file mode 100644
index 0000000..d6987b0
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/build.properties
@@ -0,0 +1,18 @@
+# Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eugen Neufeld - initial API and implementation
+
+bin.includes = .,\
+ icons/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleEntry_rule_EnableRule.gif b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleEntry_rule_EnableRule.gif
new file mode 100644
index 0000000..a7b566b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleEntry_rule_EnableRule.gif
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleEntry_rule_ShowRule.gif b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleEntry_rule_ShowRule.gif
new file mode 100644
index 0000000..0dd848b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleEntry_rule_ShowRule.gif
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleRepository_ruleEntries_RuleEntry.gif b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleRepository_ruleEntries_RuleEntry.gif
new file mode 100644
index 0000000..802bd6c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/ctool16/CreateRuleRepository_ruleEntries_RuleEntry.gif
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/obj16/RuleEntry.gif b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/obj16/RuleEntry.gif
new file mode 100644
index 0000000..693709c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/obj16/RuleEntry.gif
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/obj16/RuleRepository.gif b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/obj16/RuleRepository.gif
new file mode 100644
index 0000000..3d09261
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/icons/full/obj16/RuleRepository.gif
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.properties b/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.properties
new file mode 100644
index 0000000..8c6a9ce
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.properties
@@ -0,0 +1,37 @@
+# Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eugen Neufeld - initial API and implementation
+
+pluginName = Rulerepository Edit Support
+providerName = www.example.org
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_RuleRepository_type = Rule Repository
+_UI_ShowRuleEntry_type = Show Rule Entry
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_RuleRepository_ruleEntries_feature = Rule Entries
+_UI_ShowRuleEntry_rule_feature = Rule
+_UI_ShowRuleEntry_controls_feature = Controls
+_UI_Unknown_feature = Unspecified
+
+_UI_ShowRuleEntry_elements_feature = Elements
+_UI_RuleEntry_type = Rule Entry
+_UI_RuleEntry_rule_feature = Rule
+_UI_RuleEntry_elements_feature = Elements
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.xml b/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.xml
new file mode 100644
index 0000000..6d785bb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eugen Neufeld - initial API and implementation
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+ <!-- @generated rulerepository -->
+ <factory
+ uri="http://org/eclipse/emfforms/rulerepository/model"
+ class="org.eclipse.emfforms.spi.rulerepository.model.provider.RulerepositoryItemProviderAdapterFactory"
+ supportedTypes=
+ "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+ org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+ org.eclipse.emf.edit.provider.ITreeItemContentProvider
+ org.eclipse.emf.edit.provider.IItemLabelProvider
+ org.eclipse.emf.edit.provider.IItemPropertySource"/>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
new file mode 100644
index 0000000..92a45d4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-bundles-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.emfforms.rulerepository.model.edit</artifactId>
+<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RuleEntryItemProvider.java b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RuleEntryItemProvider.java
new file mode 100644
index 0000000..beb21b8
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RuleEntryItemProvider.java
@@ -0,0 +1,217 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.view.spi.rule.model.RuleFactory;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * This is the item provider adapter for a
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry} object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RuleEntryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public RuleEntryItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addRulePropertyDescriptor(object);
+ addElementsPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Rule feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addRulePropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_RuleEntry_rule_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_RuleEntry_rule_feature", "_UI_RuleEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VRulerepositoryPackage.Literals.RULE_ENTRY__RULE,
+ true,
+ false,
+ false,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Elements feature. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addElementsPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_RuleEntry_elements_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_RuleEntry_elements_feature", "_UI_RuleEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VRulerepositoryPackage.Literals.RULE_ENTRY__ELEMENTS,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(VRulerepositoryPackage.Literals.RULE_ENTRY__RULE);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns RuleEntry.gif.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/RuleEntry")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ return getString("_UI_RuleEntry_type"); //$NON-NLS-1$
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(VRuleEntry.class)) {
+ case VRulerepositoryPackage.RULE_ENTRY__RULE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+ * describing the children that can be created under this object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add(createChildParameter(VRulerepositoryPackage.Literals.RULE_ENTRY__RULE,
+ RuleFactory.eINSTANCE.createShowRule()));
+
+ newChildDescriptors.add(createChildParameter(VRulerepositoryPackage.Literals.RULE_ENTRY__RULE,
+ RuleFactory.eINSTANCE.createEnableRule()));
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RuleRepositoryItemProvider.java b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RuleRepositoryItemProvider.java
new file mode 100644
index 0000000..d030e7a
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RuleRepositoryItemProvider.java
@@ -0,0 +1,168 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.provider;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryFactory;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository} object.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RuleRepositoryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public RuleRepositoryItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+ * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+ * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
+ super.getChildrenFeatures(object);
+ childrenFeatures.add(VRulerepositoryPackage.Literals.RULE_REPOSITORY__RULE_ENTRIES);
+ }
+ return childrenFeatures;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
+ // Check the type of the specified child object and return the proper feature to use for
+ // adding (see {@link AddCommand}) it as a child.
+
+ return super.getChildFeature(object, child);
+ }
+
+ /**
+ * This returns RuleRepository.gif.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/RuleRepository")); //$NON-NLS-1$
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ return getString("_UI_RuleRepository_type"); //$NON-NLS-1$
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(VRuleRepository.class)) {
+ case VRulerepositoryPackage.RULE_REPOSITORY__RULE_ENTRIES:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
+ * describing the children that can be created under this object. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+
+ newChildDescriptors.add(createChildParameter(VRulerepositoryPackage.Literals.RULE_REPOSITORY__RULE_ENTRIES,
+ VRulerepositoryFactory.eINSTANCE.createRuleEntry()));
+ }
+
+ /**
+ * Return the resource locator for this item provider's resources. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return ((IChildCreationExtender) adapterFactory).getResourceLocator();
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RulerepositoryEditPlugin.java b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RulerepositoryEditPlugin.java
new file mode 100644
index 0000000..e4eb103
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RulerepositoryEditPlugin.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.emf.ecp.view.spi.model.provider.ViewEditPlugin;
+import org.eclipse.emf.ecp.view.spi.rule.model.provider.RuleEditPlugin;
+
+/**
+ * This is the central singleton for the Rulerepository edit plugin. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public final class RulerepositoryEditPlugin extends EMFPlugin {
+ /**
+ * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ public static final RulerepositoryEditPlugin INSTANCE = new RulerepositoryEditPlugin();
+
+ /**
+ * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ private static Implementation plugin;
+
+ /**
+ * Create the instance.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public RulerepositoryEditPlugin() {
+ super(new ResourceLocator[] {
+ EcoreEditPlugin.INSTANCE,
+ RuleEditPlugin.INSTANCE,
+ ViewEditPlugin.INSTANCE,
+ });
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @return the singleton instance.
+ * @generated
+ */
+ @Override
+ public ResourceLocator getPluginResourceLocator() {
+ return plugin;
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @return the singleton instance.
+ * @generated
+ */
+ public static Implementation getPlugin() {
+ return plugin;
+ }
+
+ /**
+ * The actual implementation of the Eclipse <b>Plugin</b>. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static class Implementation extends EclipsePlugin {
+ /**
+ * Creates an instance.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public Implementation() {
+ super();
+
+ // Remember the static instance.
+ //
+ plugin = this;
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RulerepositoryItemProviderAdapterFactory.java b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RulerepositoryItemProviderAdapterFactory.java
new file mode 100644
index 0000000..48044b8
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/src/org/eclipse/emfforms/spi/rulerepository/model/provider/RulerepositoryItemProviderAdapterFactory.java
@@ -0,0 +1,294 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IChildCreationExtender;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+import org.eclipse.emfforms.spi.rulerepository.model.util.RulerepositoryAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged
+ * fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+public class RulerepositoryItemProviderAdapterFactory extends RulerepositoryAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
+ /**
+ * This keeps track of the root adapter factory that delegates to this adapter factory.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected ComposedAdapterFactory parentAdapterFactory;
+
+ /**
+ * This is used to implement
+ * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+ /**
+ * This helps manage the child creation extenders.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
+ RulerepositoryEditPlugin.INSTANCE, VRulerepositoryPackage.eNS_URI);
+
+ /**
+ * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+ /**
+ * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ public RulerepositoryItemProviderAdapterFactory() {
+ supportedTypes.add(IEditingDomainItemProvider.class);
+ supportedTypes.add(IStructuredItemContentProvider.class);
+ supportedTypes.add(ITreeItemContentProvider.class);
+ supportedTypes.add(IItemLabelProvider.class);
+ supportedTypes.add(IItemPropertySource.class);
+ }
+
+ /**
+ * This keeps track of the one adapter used for all
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository} instances.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected RuleRepositoryItemProvider ruleRepositoryItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository}.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Adapter createRuleRepositoryAdapter() {
+ if (ruleRepositoryItemProvider == null) {
+ ruleRepositoryItemProvider = new RuleRepositoryItemProvider(this);
+ }
+
+ return ruleRepositoryItemProvider;
+ }
+
+ /**
+ * This keeps track of the one adapter used for all {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry}
+ * instances.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected RuleEntryItemProvider ruleEntryItemProvider;
+
+ /**
+ * This creates an adapter for a
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry}. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Adapter createRuleEntryAdapter() {
+ if (ruleEntryItemProvider == null) {
+ ruleEntryItemProvider = new RuleEntryItemProvider(this);
+ }
+
+ return ruleEntryItemProvider;
+ }
+
+ /**
+ * This returns the root adapter factory that contains this factory. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public ComposeableAdapterFactory getRootAdapterFactory() {
+ return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+ }
+
+ /**
+ * This sets the composed adapter factory that contains this factory. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+ this.parentAdapterFactory = parentAdapterFactory;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean isFactoryForType(Object type) {
+ return supportedTypes.contains(type) || super.isFactoryForType(type);
+ }
+
+ /**
+ * This implementation substitutes the factory itself as the key for the adapter.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Adapter adapt(Notifier notifier, Object type) {
+ return super.adapt(notifier, this);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object adapt(Object object, Object type) {
+ if (isFactoryForType(type)) {
+ final Object adapter = super.adapt(object, type);
+ if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
+ return adapter;
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public List<IChildCreationExtender> getChildCreationExtenders() {
+ return childCreationExtenderManager.getChildCreationExtenders();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+ return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public ResourceLocator getResourceLocator() {
+ return childCreationExtenderManager;
+ }
+
+ /**
+ * This adds a listener.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void addListener(INotifyChangedListener notifyChangedListener) {
+ changeNotifier.addListener(notifyChangedListener);
+ }
+
+ /**
+ * This removes a listener.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void removeListener(INotifyChangedListener notifyChangedListener) {
+ changeNotifier.removeListener(notifyChangedListener);
+ }
+
+ /**
+ * This delegates to {@link #changeNotifier} and to
+ * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @generated
+ */
+ @Override
+ public void fireNotifyChanged(Notification notification) {
+ changeNotifier.fireNotifyChanged(notification);
+
+ if (parentAdapterFactory != null) {
+ parentAdapterFactory.fireNotifyChanged(notification);
+ }
+ }
+
+ /**
+ * This disposes all of the item providers created by this factory. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void dispose() {
+ if (ruleRepositoryItemProvider != null) {
+ ruleRepositoryItemProvider.dispose();
+ }
+ if (ruleEntryItemProvider != null) {
+ ruleEntryItemProvider.dispose();
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.checkstyle b/bundles/org.eclipse.emfforms.rulerepository.model/.checkstyle
new file mode 100644
index 0000000..19c5477
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+ <file-match-pattern match-pattern=".java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.classpath b/bundles/org.eclipse.emfforms.rulerepository.model/.classpath
new file mode 100644
index 0000000..121e527
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.project b/bundles/org.eclipse.emfforms.rulerepository.model/.project
new file mode 100644
index 0000000..f82c154
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.rulerepository.model</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..26d14e4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,418 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8553926
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..4601b85
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model;singleton:=true
+Bundle-Version: 1.10.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.10.0",
+ org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.10.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
+ org.eclipse.emfforms.spi.rulerepository.model.util;version="1.10.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/about.html b/bundles/org.eclipse.emfforms.rulerepository.model/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/about.ini b/bundles/org.eclipse.emfforms.rulerepository.model/about.ini
new file mode 100644
index 0000000..911c4c7
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/about.mappings b/bundles/org.eclipse.emfforms.rulerepository.model/about.mappings
new file mode 100644
index 0000000..f2954d5
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=${BUILD_ID}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/about.properties b/bundles/org.eclipse.emfforms.rulerepository.model/about.properties
new file mode 100644
index 0000000..f2e9a50
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/about.properties
@@ -0,0 +1,32 @@
+# Copyright (c) 2011, 2014 Eclipsesource Munich GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eugen Neufeld - initial API and implementation
+# Eike Stepper - initial API and implementation
+
+# NLS_MESSAGEFORMAT_VAR
+
+# ==============================================================================
+# Do not change the properties between this line and the last line containing:
+# %%% END OF TRANSLATED PROPERTIES %%%
+# Instead, either redefine an existing property, or create a new property,
+# append it to the end of the file, and change the code to use the new name.
+# ==============================================================================
+
+featureName = ECP EMF Client Platform
+featureText = ECP EMF Client Platform\n\
+Version: {featureVersion}\n\
+Build id: {0}\n\
+\n\
+Copyright (c) 2011, 2014 Eclipsesource Munich GmbH and others. All rights reserved.\n\
+\n\
+Visit http://www.eclipse.org/ecp
+
+# ==============================================================================
+# %%% END OF TRANSLATED PROPERTIES %%%
+# The above properties have been shipped for translation.
+# ==============================================================================
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/build.properties b/bundles/org.eclipse.emfforms.rulerepository.model/build.properties
new file mode 100644
index 0000000..e1281ef
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/build.properties
@@ -0,0 +1,24 @@
+# Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eugen Neufeld - initial API and implementation
+
+bin.includes = .,\
+ model/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties,\
+ about.html,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ modeling32.png
+jars.compile.order = .
+source.. = src/
+output.. = bin/
+src.includes = about.html
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/copyright.txt b/bundles/org.eclipse.emfforms.rulerepository.model/copyright.txt
new file mode 100644
index 0000000..8234ba9
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/copyright.txt
@@ -0,0 +1,8 @@
+Copyright (c) 2011 Eike Stepper (Berlin, Germany) and others.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+
+Contributors:
+ Eike Stepper - initial API and implementation
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.ecore b/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.ecore
new file mode 100644
index 0000000..29ca078
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.ecore
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="rulerepository" nsURI="http://org/eclipse/emfforms/rulerepository/model"
+ nsPrefix="org.eclipse.emfforms.rulerepository.model">
+ <eClassifiers xsi:type="ecore:EClass" name="RuleRepository">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="ruleEntries" upperBound="-1"
+ eType="#//RuleEntry" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="RuleEntry">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.rule.model/model/rule.ecore#//Rule"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
+ eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//Element"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.genmodel b/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.genmodel
new file mode 100644
index 0000000..ad282e2
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.genmodel
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.

All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html

Contributors:
Eugen Neufeld - initial API and implementation"
+ modelDirectory="/org.eclipse.emfforms.rulerepository.model/src" modelPluginID="org.eclipse.emfforms.rulerepository.model"
+ redirection="" modelName="Rulerepository" nonNLSMarkers="true" codeFormatting="true"
+ commentFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"
+ copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.ecp.view.rule.model/model/rule.genmodel#//rule ../../org.eclipse.emf.ecp.view.model/model/view.genmodel#//model"
+ interfaceNamePattern="V{0}" classNamePattern="V{0}Impl" importOrganizing="true"
+ cleanup="true">
+ <foreignModel>rulerepository.ecore</foreignModel>
+ <genPackages prefix="Rulerepository" basePackage="org.eclipse.emfforms.spi" resource="XMI"
+ disposableProviderFactory="true" interfacePackageSuffix="model" metaDataPackageSuffix="model"
+ classPackageSuffix="model.impl" utilityPackageSuffix="model.util" providerPackageSuffix="model.provider"
+ presentationPackageSuffix="model.presentation" testsPackageSuffix="model.tests"
+ extensibleProviderFactory="true" childCreationExtenders="true" ecorePackage="rulerepository.ecore#/">
+ <genClasses ecoreClass="rulerepository.ecore#//RuleRepository">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference rulerepository.ecore#//RuleRepository/ruleEntries"/>
+ </genClasses>
+ <genClasses ecoreClass="rulerepository.ecore#//RuleEntry">
+ <genFeatures children="true" createChild="true" ecoreFeature="ecore:EReference rulerepository.ecore#//RuleEntry/rule"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference rulerepository.ecore#//RuleEntry/elements"/>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/modeling32.png b/bundles/org.eclipse.emfforms.rulerepository.model/modeling32.png
new file mode 100644
index 0000000..6b08de2
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/modeling32.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/plugin.properties b/bundles/org.eclipse.emfforms.rulerepository.model/plugin.properties
new file mode 100644
index 0000000..4909b8f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/plugin.properties
@@ -0,0 +1,12 @@
+# Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Eugen Neufeld - initial API and implementation
+
+pluginName = Rulerepository Model
+providerName = www.example.org
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/plugin.xml b/bundles/org.eclipse.emfforms.rulerepository.model/plugin.xml
new file mode 100644
index 0000000..4bc4e19
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/plugin.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Eugen Neufeld - initial API and implementation
+-->
+
+<plugin>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated rulerepository -->
+ <package
+ uri="http://org/eclipse/emfforms/rulerepository/model"
+ class="org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage"
+ genModel="model/rulerepository.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.extension_parser">
+ <!-- @generated rulerepository -->
+ <parser
+ type="rulerepository"
+ class="org.eclipse.emfforms.spi.rulerepository.model.util.VRulerepositoryResourceFactoryImpl"/>
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
new file mode 100644
index 0000000..0fcfff9
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-bundles-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.emfforms.rulerepository.model</artifactId>
+<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRuleEntry.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRuleEntry.java
new file mode 100644
index 0000000..76af66a
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRuleEntry.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.rule.model.Rule;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Rule Entry</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getRule <em>Rule</em>}</li>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getElements <em>Elements</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage#getRuleEntry()
+ * @model
+ * @generated
+ */
+public interface VRuleEntry extends EObject {
+ /**
+ * Returns the value of the '<em><b>Rule</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Rule</em>' containment reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Rule</em>' containment reference.
+ * @see #setRule(Rule)
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage#getRuleEntry_Rule()
+ * @model containment="true" required="true"
+ * @generated
+ */
+ Rule getRule();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getRule <em>Rule</em>}'
+ * containment reference.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param value the new value of the '<em>Rule</em>' containment reference.
+ * @see #getRule()
+ * @generated
+ */
+ void setRule(Rule value);
+
+ /**
+ * Returns the value of the '<em><b>Elements</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.ecp.view.spi.model.VElement}.
+ * <!-- begin-user-doc
+ * -->
+ * <p>
+ * If the meaning of the '<em>Elements</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Elements</em>' reference list.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage#getRuleEntry_Elements()
+ * @model
+ * @generated
+ */
+ EList<VElement> getElements();
+
+} // VRuleEntry
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRuleRepository.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRuleRepository.java
new file mode 100644
index 0000000..fd5a97d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRuleRepository.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Rule Repository</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository#getRuleEntries <em>Rule Entries</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage#getRuleRepository()
+ * @model
+ * @generated
+ */
+public interface VRuleRepository extends EObject {
+ /**
+ * Returns the value of the '<em><b>Rule Entries</b></em>' containment
+ * reference list. The list contents are of type
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry}. <!--
+ * begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Rule Entries</em>' containment reference list
+ * isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Rule Entries</em>' containment reference
+ * list.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage#getRuleRepository_RuleEntries()
+ * @model containment="true"
+ * @generated
+ */
+ EList<VRuleEntry> getRuleEntries();
+
+} // VRuleRepository
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRulerepositoryFactory.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRulerepositoryFactory.java
new file mode 100644
index 0000000..fc111e1
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRulerepositoryFactory.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
+ * create method for each non-abstract class of the model. <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage
+ * @generated
+ */
+public interface VRulerepositoryFactory extends EFactory {
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ VRulerepositoryFactory eINSTANCE = org.eclipse.emfforms.spi.rulerepository.model.impl.VRulerepositoryFactoryImpl
+ .init();
+
+ /**
+ * Returns a new object of class '<em>Rule Repository</em>'. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Rule Repository</em>'.
+ * @generated
+ */
+ VRuleRepository createRuleRepository();
+
+ /**
+ * Returns a new object of class '<em>Rule Entry</em>'.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Rule Entry</em>'.
+ * @generated
+ */
+ VRuleEntry createRuleEntry();
+
+ /**
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the package supported by this factory.
+ * @generated
+ */
+ VRulerepositoryPackage getRulerepositoryPackage();
+
+} // VRulerepositoryFactory
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRulerepositoryPackage.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRulerepositoryPackage.java
new file mode 100644
index 0000000..0d25d89
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/VRulerepositoryPackage.java
@@ -0,0 +1,270 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
+ * accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface VRulerepositoryPackage extends EPackage {
+ /**
+ * The package name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNAME = "rulerepository"; //$NON-NLS-1$
+
+ /**
+ * The package namespace URI.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_URI = "http://org/eclipse/emfforms/rulerepository/model"; //$NON-NLS-1$
+
+ /**
+ * The package namespace name.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_PREFIX = "org.eclipse.emfforms.rulerepository.model"; //$NON-NLS-1$
+
+ /**
+ * The singleton instance of the package.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ VRulerepositoryPackage eINSTANCE = org.eclipse.emfforms.spi.rulerepository.model.impl.VRulerepositoryPackageImpl
+ .init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleRepositoryImpl
+ * <em>Rule Repository</em>}' class.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleRepositoryImpl
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRulerepositoryPackageImpl#getRuleRepository()
+ * @generated
+ */
+ int RULE_REPOSITORY = 0;
+
+ /**
+ * The feature id for the '<em><b>Rule Entries</b></em>' containment reference list.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RULE_REPOSITORY__RULE_ENTRIES = 0;
+
+ /**
+ * The number of structural features of the '<em>Rule Repository</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RULE_REPOSITORY_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl
+ * <em>Rule Entry</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
+ * -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRulerepositoryPackageImpl#getRuleEntry()
+ * @generated
+ */
+ int RULE_ENTRY = 1;
+
+ /**
+ * The feature id for the '<em><b>Rule</b></em>' containment reference. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RULE_ENTRY__RULE = 0;
+
+ /**
+ * The feature id for the '<em><b>Elements</b></em>' reference list. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RULE_ENTRY__ELEMENTS = 1;
+
+ /**
+ * The number of structural features of the '<em>Rule Entry</em>' class.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RULE_ENTRY_FEATURE_COUNT = 2;
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository
+ * <em>Rule Repository</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Rule Repository</em>'.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository
+ * @generated
+ */
+ EClass getRuleRepository();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository#getRuleEntries <em>Rule Entries</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Rule Entries</em>'.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository#getRuleEntries()
+ * @see #getRuleRepository()
+ * @generated
+ */
+ EReference getRuleRepository_RuleEntries();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry
+ * <em>Rule Entry</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Rule Entry</em>'.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry
+ * @generated
+ */
+ EClass getRuleEntry();
+
+ /**
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getRule <em>Rule</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference '<em>Rule</em>'.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getRule()
+ * @see #getRuleEntry()
+ * @generated
+ */
+ EReference getRuleEntry_Rule();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getElements <em>Elements</em>}'.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>Elements</em>'.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getElements()
+ * @see #getRuleEntry()
+ * @generated
+ */
+ EReference getRuleEntry_Elements();
+
+ /**
+ * Returns the factory that creates the instances of the model. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the factory that creates the instances of the model.
+ * @generated
+ */
+ VRulerepositoryFactory getRulerepositoryFactory();
+
+ /**
+ * <!-- begin-user-doc --> Defines literals for the meta objects that
+ * represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ interface Literals {
+ /**
+ * The meta object literal for the '
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleRepositoryImpl <em>Rule Repository</em>}'
+ * class.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleRepositoryImpl
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRulerepositoryPackageImpl#getRuleRepository()
+ * @generated
+ */
+ EClass RULE_REPOSITORY = eINSTANCE.getRuleRepository();
+
+ /**
+ * The meta object literal for the '<em><b>Rule Entries</b></em>' containment reference list feature.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ EReference RULE_REPOSITORY__RULE_ENTRIES = eINSTANCE.getRuleRepository_RuleEntries();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl
+ * <em>Rule Entry</em>}' class.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl
+ * @see org.eclipse.emfforms.spi.rulerepository.model.impl.VRulerepositoryPackageImpl#getRuleEntry()
+ * @generated
+ */
+ EClass RULE_ENTRY = eINSTANCE.getRuleEntry();
+
+ /**
+ * The meta object literal for the '<em><b>Rule</b></em>' containment reference feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference RULE_ENTRY__RULE = eINSTANCE.getRuleEntry_Rule();
+
+ /**
+ * The meta object literal for the '<em><b>Elements</b></em>' reference list feature.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference RULE_ENTRY__ELEMENTS = eINSTANCE.getRuleEntry_Elements();
+
+ }
+
+} // VRulerepositoryPackage
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRuleEntryImpl.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRuleEntryImpl.java
new file mode 100644
index 0000000..bfdc9a6
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRuleEntryImpl.java
@@ -0,0 +1,237 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.rule.model.Rule;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Rule Entry</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl#getRule <em>Rule</em>}</li>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl#getElements <em>Elements</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VRuleEntryImpl extends EObjectImpl implements VRuleEntry {
+ /**
+ * The cached value of the '{@link #getRule() <em>Rule</em>}' containment reference.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getRule()
+ * @generated
+ * @ordered
+ */
+ protected Rule rule;
+
+ /**
+ * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getElements()
+ * @generated
+ * @ordered
+ */
+ protected EList<VElement> elements;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected VRuleEntryImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return VRulerepositoryPackage.Literals.RULE_ENTRY;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Rule getRule() {
+ return rule;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetRule(Rule newRule, NotificationChain msgs) {
+ final Rule oldRule = rule;
+ rule = newRule;
+ if (eNotificationRequired()) {
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+ VRulerepositoryPackage.RULE_ENTRY__RULE, oldRule, newRule);
+ if (msgs == null) {
+ msgs = notification;
+ } else {
+ msgs.add(notification);
+ }
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setRule(Rule newRule) {
+ if (newRule != rule) {
+ NotificationChain msgs = null;
+ if (rule != null) {
+ msgs = ((InternalEObject) rule).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - VRulerepositoryPackage.RULE_ENTRY__RULE, null, msgs);
+ }
+ if (newRule != null) {
+ msgs = ((InternalEObject) newRule).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - VRulerepositoryPackage.RULE_ENTRY__RULE, null, msgs);
+ }
+ msgs = basicSetRule(newRule, msgs);
+ if (msgs != null) {
+ msgs.dispatch();
+ }
+ } else if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, VRulerepositoryPackage.RULE_ENTRY__RULE, newRule,
+ newRule));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EList<VElement> getElements() {
+ if (elements == null) {
+ elements = new EObjectResolvingEList<VElement>(VElement.class, this,
+ VRulerepositoryPackage.RULE_ENTRY__ELEMENTS);
+ }
+ return elements;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__RULE:
+ return basicSetRule(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__RULE:
+ return getRule();
+ case VRulerepositoryPackage.RULE_ENTRY__ELEMENTS:
+ return getElements();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__RULE:
+ setRule((Rule) newValue);
+ return;
+ case VRulerepositoryPackage.RULE_ENTRY__ELEMENTS:
+ getElements().clear();
+ getElements().addAll((Collection<? extends VElement>) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__RULE:
+ setRule((Rule) null);
+ return;
+ case VRulerepositoryPackage.RULE_ENTRY__ELEMENTS:
+ getElements().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__RULE:
+ return rule != null;
+ case VRulerepositoryPackage.RULE_ENTRY__ELEMENTS:
+ return elements != null && !elements.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} // VRuleEntryImpl
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRuleRepositoryImpl.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRuleRepositoryImpl.java
new file mode 100644
index 0000000..7d8e476
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRuleRepositoryImpl.java
@@ -0,0 +1,158 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Rule Repository</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleRepositoryImpl#getRuleEntries
+ * <em>Rule Entries</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VRuleRepositoryImpl extends EObjectImpl implements VRuleRepository {
+ /**
+ * The cached value of the '{@link #getRuleEntries() <em>Rule Entries</em>}' containment reference list.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see #getRuleEntries()
+ * @generated
+ * @ordered
+ */
+ protected EList<VRuleEntry> ruleEntries;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected VRuleRepositoryImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return VRulerepositoryPackage.Literals.RULE_REPOSITORY;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EList<VRuleEntry> getRuleEntries() {
+ if (ruleEntries == null) {
+ ruleEntries = new EObjectContainmentEList<VRuleEntry>(VRuleEntry.class, this,
+ VRulerepositoryPackage.RULE_REPOSITORY__RULE_ENTRIES);
+ }
+ return ruleEntries;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_REPOSITORY__RULE_ENTRIES:
+ return ((InternalEList<?>) getRuleEntries()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_REPOSITORY__RULE_ENTRIES:
+ return getRuleEntries();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_REPOSITORY__RULE_ENTRIES:
+ getRuleEntries().clear();
+ getRuleEntries().addAll((Collection<? extends VRuleEntry>) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_REPOSITORY__RULE_ENTRIES:
+ getRuleEntries().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case VRulerepositoryPackage.RULE_REPOSITORY__RULE_ENTRIES:
+ return ruleEntries != null && !ruleEntries.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+} // VRuleRepositoryImpl
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRulerepositoryFactoryImpl.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRulerepositoryFactoryImpl.java
new file mode 100644
index 0000000..e2237a8
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRulerepositoryFactoryImpl.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryFactory;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+public class VRulerepositoryFactoryImpl extends EFactoryImpl implements VRulerepositoryFactory {
+ /**
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ public static VRulerepositoryFactory init() {
+ try {
+ final VRulerepositoryFactory theRulerepositoryFactory = (VRulerepositoryFactory) EPackage.Registry.INSTANCE
+ .getEFactory(VRulerepositoryPackage.eNS_URI);
+ if (theRulerepositoryFactory != null) {
+ return theRulerepositoryFactory;
+ }
+ } catch (final Exception exception) {
+ EcorePlugin.INSTANCE.log(exception);
+ }
+ return new VRulerepositoryFactoryImpl();
+ }
+
+ /**
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ public VRulerepositoryFactoryImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EObject create(EClass eClass) {
+ switch (eClass.getClassifierID()) {
+ case VRulerepositoryPackage.RULE_REPOSITORY:
+ return createRuleRepository();
+ case VRulerepositoryPackage.RULE_ENTRY:
+ return createRuleEntry();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public VRuleRepository createRuleRepository() {
+ final VRuleRepositoryImpl ruleRepository = new VRuleRepositoryImpl();
+ return ruleRepository;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public VRuleEntry createRuleEntry() {
+ final VRuleEntryImpl ruleEntry = new VRuleEntryImpl();
+ return ruleEntry;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public VRulerepositoryPackage getRulerepositoryPackage() {
+ return (VRulerepositoryPackage) getEPackage();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @deprecated
+ * @generated
+ */
+ @Deprecated
+ public static VRulerepositoryPackage getPackage() {
+ return VRulerepositoryPackage.eINSTANCE;
+ }
+
+} // VRulerepositoryFactoryImpl
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRulerepositoryPackageImpl.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRulerepositoryPackageImpl.java
new file mode 100644
index 0000000..9b38b9e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/impl/VRulerepositoryPackageImpl.java
@@ -0,0 +1,260 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
+import org.eclipse.emf.ecp.view.spi.rule.model.RulePackage;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryFactory;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+public class VRulerepositoryPackageImpl extends EPackageImpl implements VRulerepositoryPackage {
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass ruleRepositoryEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass ruleEntryEClass = null;
+
+ /**
+ * Creates an instance of the model <b>Package</b>, registered with
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+ * package package URI value.
+ * <p>
+ * Note: the correct way to create the package is via the static factory
+ * method {@link #init init()}, which also performs initialization of the
+ * package, or returns the registered package, if one already exists. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.ecore.EPackage.Registry
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage#eNS_URI
+ * @see #init()
+ * @generated
+ */
+ private VRulerepositoryPackageImpl() {
+ super(eNS_URI, VRulerepositoryFactory.eINSTANCE);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private static boolean isInited = false;
+
+ /**
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>
+ * This method is used to initialize {@link VRulerepositoryPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @see #eNS_URI
+ * @see #createPackageContents()
+ * @see #initializePackageContents()
+ * @generated
+ */
+ public static VRulerepositoryPackage init() {
+ if (isInited) {
+ return (VRulerepositoryPackage) EPackage.Registry.INSTANCE.getEPackage(VRulerepositoryPackage.eNS_URI);
+ }
+
+ // Obtain or create and register package
+ final VRulerepositoryPackageImpl theRulerepositoryPackage = (VRulerepositoryPackageImpl) (EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof VRulerepositoryPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new VRulerepositoryPackageImpl());
+
+ isInited = true;
+
+ // Initialize simple dependencies
+ RulePackage.eINSTANCE.eClass();
+
+ // Create package meta-data objects
+ theRulerepositoryPackage.createPackageContents();
+
+ // Initialize created meta-data
+ theRulerepositoryPackage.initializePackageContents();
+
+ // Mark meta-data to indicate it can't be changed
+ theRulerepositoryPackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(VRulerepositoryPackage.eNS_URI, theRulerepositoryPackage);
+ return theRulerepositoryPackage;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EClass getRuleRepository() {
+ return ruleRepositoryEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EReference getRuleRepository_RuleEntries() {
+ return (EReference) ruleRepositoryEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EClass getRuleEntry() {
+ return ruleEntryEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EReference getRuleEntry_Rule() {
+ return (EReference) ruleEntryEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EReference getRuleEntry_Elements() {
+ return (EReference) ruleEntryEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public VRulerepositoryFactory getRulerepositoryFactory() {
+ return (VRulerepositoryFactory) getEFactoryInstance();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private boolean isCreated = false;
+
+ /**
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void createPackageContents() {
+ if (isCreated) {
+ return;
+ }
+ isCreated = true;
+
+ // Create classes and their features
+ ruleRepositoryEClass = createEClass(RULE_REPOSITORY);
+ createEReference(ruleRepositoryEClass, RULE_REPOSITORY__RULE_ENTRIES);
+
+ ruleEntryEClass = createEClass(RULE_ENTRY);
+ createEReference(ruleEntryEClass, RULE_ENTRY__RULE);
+ createEReference(ruleEntryEClass, RULE_ENTRY__ELEMENTS);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private boolean isInitialized = false;
+
+ /**
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void initializePackageContents() {
+ if (isInitialized) {
+ return;
+ }
+ isInitialized = true;
+
+ // Initialize package
+ setName(eNAME);
+ setNsPrefix(eNS_PREFIX);
+ setNsURI(eNS_URI);
+
+ // Obtain other dependent packages
+ final RulePackage theRulePackage = (RulePackage) EPackage.Registry.INSTANCE.getEPackage(RulePackage.eNS_URI);
+ final VViewPackage theViewPackage = (VViewPackage) EPackage.Registry.INSTANCE.getEPackage(VViewPackage.eNS_URI);
+
+ // Create type parameters
+
+ // Set bounds for type parameters
+
+ // Add supertypes to classes
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(ruleRepositoryEClass, VRuleRepository.class, "RuleRepository", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getRuleRepository_RuleEntries(), getRuleEntry(), null, "ruleEntries", null, 0, -1, //$NON-NLS-1$
+ VRuleRepository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(ruleEntryEClass, VRuleEntry.class, "RuleEntry", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getRuleEntry_Rule(), theRulePackage.getRule(), null, "rule", null, 1, 1, VRuleEntry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getRuleEntry_Elements(), theViewPackage.getElement(), null, "elements", null, 0, -1, //$NON-NLS-1$
+ VRuleEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ // Create resource
+ createResource(eNS_URI);
+ }
+
+} // VRulerepositoryPackageImpl
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/RulerepositoryAdapterFactory.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/RulerepositoryAdapterFactory.java
new file mode 100644
index 0000000..fe639b4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/RulerepositoryAdapterFactory.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
+ * an adapter <code>createXXX</code> method for each class of the model. <!--
+ * end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage
+ * @generated
+ */
+public class RulerepositoryAdapterFactory extends AdapterFactoryImpl {
+ /**
+ * The cached model package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected static VRulerepositoryPackage modelPackage;
+
+ /**
+ * Creates an instance of the adapter factory.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ public RulerepositoryAdapterFactory() {
+ if (modelPackage == null) {
+ modelPackage = VRulerepositoryPackage.eINSTANCE;
+ }
+ }
+
+ /**
+ * Returns whether this factory is applicable for the type of the object.
+ * <!-- begin-user-doc --> This implementation returns <code>true</code> if
+ * the object is either the model's package or is an instance object of the
+ * model. <!-- end-user-doc -->
+ *
+ * @return whether this factory is applicable for the type of the object.
+ * @generated
+ */
+ @Override
+ public boolean isFactoryForType(Object object) {
+ if (object == modelPackage) {
+ return true;
+ }
+ if (object instanceof EObject) {
+ return ((EObject) object).eClass().getEPackage() == modelPackage;
+ }
+ return false;
+ }
+
+ /**
+ * The switch that delegates to the <code>createXXX</code> methods. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected RulerepositorySwitch<Adapter> modelSwitch = new RulerepositorySwitch<Adapter>() {
+ @Override
+ public Adapter caseRuleRepository(VRuleRepository object) {
+ return createRuleRepositoryAdapter();
+ }
+
+ @Override
+ public Adapter caseRuleEntry(VRuleEntry object) {
+ return createRuleEntryAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
+
+ /**
+ * Creates an adapter for the <code>target</code>.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param target the object to adapt.
+ * @return the adapter for the <code>target</code>.
+ * @generated
+ */
+ @Override
+ public Adapter createAdapter(Notifier target) {
+ return modelSwitch.doSwitch((EObject) target);
+ }
+
+ /**
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository <em>Rule Repository</em>}'.
+ * <!-- begin-user-doc --> This default
+ * implementation returns null so that we can easily ignore cases; it's
+ * useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository
+ * @generated
+ */
+ public Adapter createRuleRepositoryAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry
+ * <em>Rule Entry</em>}'.
+ * <!-- begin-user-doc --> This default
+ * implementation returns null so that we can easily ignore cases; it's
+ * useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry
+ * @generated
+ */
+ public Adapter createRuleEntryAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for the default case.
+ * <!-- begin-user-doc --> This
+ * default implementation returns null. <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @generated
+ */
+ public Adapter createEObjectAdapter() {
+ return null;
+ }
+
+} // RulerepositoryAdapterFactory
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/RulerepositorySwitch.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/RulerepositorySwitch.java
new file mode 100644
index 0000000..6f82eb2
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/RulerepositorySwitch.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
+
+/**
+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object and proceeding up the
+ * inheritance hierarchy until a non-null result is returned, which is the
+ * result of the switch. <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage
+ * @generated
+ */
+public class RulerepositorySwitch<T> extends Switch<T> {
+ /**
+ * The cached model package
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected static VRulerepositoryPackage modelPackage;
+
+ /**
+ * Creates an instance of the switch.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ public RulerepositorySwitch() {
+ if (modelPackage == null) {
+ modelPackage = VRulerepositoryPackage.eINSTANCE;
+ }
+ }
+
+ /**
+ * Checks whether this is a switch for the given package. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @param ePackage
+ * the package in question.
+ * @return whether this is a switch for the given package.
+ * @generated
+ */
+ @Override
+ protected boolean isSwitchFor(EPackage ePackage) {
+ return ePackage == modelPackage;
+ }
+
+ /**
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+ * result.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @generated
+ */
+ @Override
+ protected T doSwitch(int classifierID, EObject theEObject) {
+ switch (classifierID) {
+ case VRulerepositoryPackage.RULE_REPOSITORY: {
+ final VRuleRepository ruleRepository = (VRuleRepository) theEObject;
+ T result = caseRuleRepository(ruleRepository);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case VRulerepositoryPackage.RULE_ENTRY: {
+ final VRuleEntry ruleEntry = (VRuleEntry) theEObject;
+ T result = caseRuleEntry(ruleEntry);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ default:
+ return defaultCase(theEObject);
+ }
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Rule Repository</em>'.
+ * <!-- begin-user-doc --> This implementation
+ * returns null; returning a non-null result will terminate the switch. <!--
+ * end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Rule Repository</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseRuleRepository(VRuleRepository object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Rule Entry</em>'.
+ * <!-- begin-user-doc --> This implementation returns
+ * null; returning a non-null result will terminate the switch. <!--
+ * end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Rule Entry</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseRuleEntry(VRuleEntry object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+ * <!-- begin-user-doc --> This implementation returns
+ * null; returning a non-null result will terminate the switch, but this is
+ * the last case anyway. <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+ * @generated
+ */
+ @Override
+ public T defaultCase(EObject object) {
+ return null;
+ }
+
+} // RulerepositorySwitch
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/VRulerepositoryResourceFactoryImpl.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/VRulerepositoryResourceFactoryImpl.java
new file mode 100644
index 0000000..9bb6e56
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/VRulerepositoryResourceFactoryImpl.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+/**
+ * <!-- begin-user-doc --> The <b>Resource Factory</b> associated with the
+ * package. <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.util.VRulerepositoryResourceImpl
+ * @generated
+ */
+public class VRulerepositoryResourceFactoryImpl extends ResourceFactoryImpl {
+ /**
+ * Creates an instance of the resource factory.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ public VRulerepositoryResourceFactoryImpl() {
+ super();
+ }
+
+ /**
+ * Creates an instance of the resource.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Resource createResource(URI uri) {
+ final Resource result = new VRulerepositoryResourceImpl(uri);
+ return result;
+ }
+
+} // VRulerepositoryResourceFactoryImpl
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/VRulerepositoryResourceImpl.java b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/VRulerepositoryResourceImpl.java
new file mode 100644
index 0000000..7b5c45b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/src/org/eclipse/emfforms/spi/rulerepository/model/util/VRulerepositoryResourceImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ */
+package org.eclipse.emfforms.spi.rulerepository.model.util;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+
+/**
+ * <!-- begin-user-doc --> The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emfforms.spi.rulerepository.model.util.VRulerepositoryResourceFactoryImpl
+ * @generated
+ */
+public class VRulerepositoryResourceImpl extends XMIResourceImpl {
+ /**
+ * Creates an instance of the resource.
+ * <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param uri the URI of the new resource.
+ * @generated
+ */
+ public VRulerepositoryResourceImpl(URI uri) {
+ super(uri);
+ }
+
+} // VRulerepositoryResourceImpl
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.checkstyle b/bundles/org.eclipse.emfforms.rulerepository.tooling/.checkstyle
new file mode 100644
index 0000000..19c5477
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+ <file-match-pattern match-pattern=".java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.classpath b/bundles/org.eclipse.emfforms.rulerepository.tooling/.classpath
new file mode 100644
index 0000000..098194c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.project b/bundles/org.eclipse.emfforms.rulerepository.tooling/.project
new file mode 100644
index 0000000..9e9c235
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.rulerepository.tooling</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.wuetherich.osgi.ds.annotations.dsAnnotationBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..984712d
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,408 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8553926
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7e730ee
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
@@ -0,0 +1,32 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMFForms RuleRepository Tooling
+Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling;singleton:=true
+Bundle-Version: 1.10.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.10.0,4.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
+ org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
+ org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Service-Component: OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.10.0,2.0.0)",
+ org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.10.0";x-internal:=true
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml
new file mode 100644
index 0000000..33e70bc
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryLinkFeatureControlRendererService.java]-->
+<scr:component name="org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+ <implementation class="org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService"/>
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+ </service>
+ <reference name="EMFFormsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" bind="setEMFFormsDatabinding"/>
+ <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
+</scr:component>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/build.properties b/bundles/org.eclipse.emfforms.rulerepository.tooling/build.properties
new file mode 100644
index 0000000..dbc6937
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/build.properties
@@ -0,0 +1,7 @@
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ icons,\
+ OSGI-INF/
+source.. = src/
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/icons/RuleRepositoryEditor.png b/bundles/org.eclipse.emfforms.rulerepository.tooling/icons/RuleRepositoryEditor.png
new file mode 100644
index 0000000..e501b66
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/icons/RuleRepositoryEditor.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/icons/RuleRepositoryMerge.png b/bundles/org.eclipse.emfforms.rulerepository.tooling/icons/RuleRepositoryMerge.png
new file mode 100644
index 0000000..7c0ab2b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/icons/RuleRepositoryMerge.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/plugin.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/plugin.xml
new file mode 100644
index 0000000..49e9032
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/plugin.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.editors">
+ <editor
+ class="org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryEditor"
+ default="false"
+ extensions="rulerepository"
+ icon="icons/RuleRepositoryEditor.png"
+ id="org.eclipse.emfforms.rulerepository.tooling.editor"
+ name="Rule Reposotory Editor">
+ </editor>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">
+ <menu
+ id="org.eclipse.emf.ecp.ui.e3.emfFormsMenu"
+ label="EMF Forms">
+ <command
+ commandId="org.eclipse.emfforms.rulerepository.tooling.merge"
+ icon="icons/RuleRepositoryMerge.png"
+ label="Merge with View Model"
+ style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <iterate
+ ifEmpty="false">
+ <adapt
+ type="org.eclipse.core.resources.IFile">
+ <test
+ property="org.eclipse.core.resources.name"
+ value="*.rulerepository">
+ </test>
+ </adapt>
+ </iterate>
+ </visibleWhen>
+ </command>
+ </menu>
+ </menuContribution>
+ </extension>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ defaultHandler="org.eclipse.emfforms.internal.rulerepository.tooling.merge.MergeWithViewHandler"
+ id="org.eclipse.emfforms.rulerepository.tooling.merge"
+ name="Merge with View Model">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.newWizards">
+ <wizard
+ category="org.eclipse.emf.ecp.view.ide"
+ class="org.eclipse.emfforms.internal.rulerepository.tooling.wizard.EMFFormsRuleRepositoryWizard"
+ icon="icons/RuleRepositoryEditor.png"
+ id="org.eclipse.emfforms.rulerepository.tooling.wizard"
+ name="RuleRepository Model">
+ </wizard>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
new file mode 100644
index 0000000..374496e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-bundles-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.emfforms.rulerepository.tooling</artifactId>
+<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryEditor.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryEditor.java
new file mode 100644
index 0000000..329a055
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryEditor.java
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.xml.type.AnyType;
+import org.eclipse.emf.ecp.internal.ide.util.EcoreHelper;
+import org.eclipse.emf.ecp.view.spi.model.VView;
+import org.eclipse.emfforms.internal.editor.toolbaractions.LoadEcoreAction;
+import org.eclipse.emfforms.spi.editor.GenericEditor;
+import org.eclipse.jface.action.Action;
+import org.eclipse.ui.IEditorInput;
+
+/**
+ * RuleRepositoryEditor.
+ *
+ * @author Eugen Neufeld
+ *
+ */
+@SuppressWarnings("restriction")
+public class RuleRepositoryEditor extends GenericEditor {
+
+ /**
+ * Returns the toolbar actions for this editor.
+ *
+ * @return A list of actions to show in the Editor's Toolbar
+ */
+ @Override
+ protected List<Action> getToolbarActions() {
+ final List<Action> result = new LinkedList<Action>();
+
+ result.add(new LoadEcoreAction(getResourceSet(), "Load ViewModel")); //$NON-NLS-1$
+
+ // result.addAll(readToolbarActions());
+ return result;
+ }
+
+ private void registerEcore(ResourceSet resourceSet) throws IOException {
+ for (final Resource resource : resourceSet.getResources()) {
+ if (resource.getContents().isEmpty()) {
+ continue;
+ }
+ if (!VView.class.isInstance(resource.getContents().get(0))) {
+ continue;
+ }
+ final String ecorePath = getEcorePath(resource);
+ if (ecorePath == null) {
+ return;
+ }
+ EcoreHelper.registerEcore(ecorePath);
+ }
+ // resolve all proxies
+ EcoreUtil.resolveAll(resourceSet);
+ }
+
+ private String getEcorePath(Resource resource) {
+ if (resource == null || resource.getContents().isEmpty()) {
+ return null;
+ }
+ final EObject eObject = resource.getContents().get(0);
+ if (VView.class.isInstance(eObject)) {
+ return VView.class.cast(eObject).getEcorePath();
+ }
+ if (AnyType.class.isInstance(eObject)) {
+ /* view model has older ns uri */
+ final FeatureMap anyAttribute = AnyType.class.cast(eObject).getAnyAttribute();
+ for (int i = 0; i < anyAttribute.size(); i++) {
+ final EStructuralFeature feature = anyAttribute.getEStructuralFeature(i);
+ if ("ecorePath".equals(feature.getName())) { //$NON-NLS-1$
+ return (String) anyAttribute.getValue(i);
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected ResourceSet loadResource(IEditorInput editorInput) {
+ final ResourceSet result = super.loadResource(editorInput);
+ try {
+ registerEcore(result);
+ } catch (final IOException ex) {
+ ex.printStackTrace();
+ }
+ return super.loadResource(editorInput);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.editor.GenericEditor#dispose()
+ */
+ @Override
+ public void dispose() {
+ for (final Resource resource : getResourceSet().getResources()) {
+ if (resource.getContents().isEmpty()) {
+ continue;
+ }
+ if (!VView.class.isInstance(resource.getContents().get(0))) {
+ continue;
+ }
+ final String ecorePath = getEcorePath(resource);
+ if (ecorePath == null) {
+ return;
+ }
+ EcoreHelper.unregisterEcore(ecorePath);
+ }
+ super.dispose();
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryLinkFeatureControlRenderer.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryLinkFeatureControlRenderer.java
new file mode 100644
index 0000000..d058aea
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryLinkFeatureControlRenderer.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecp.view.internal.editor.controls.LinkFeatureControlRenderer;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VView;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+
+/**
+ * A control renderer which is used for selecting a DMR. To retrieve the root EClass this renderer uses the resource to
+ * get the selected view model.
+ *
+ * @author Eugen
+ *
+ */
+@SuppressWarnings("restriction")
+public class RuleRepositoryLinkFeatureControlRenderer extends LinkFeatureControlRenderer {
+
+ /**
+ * Default constructor.
+ *
+ * @param vElement The {@link VControl} of this renderer
+ * @param viewContext The {@link ViewModelContext} of this renderer
+ * @param reportService The {@link ReportService} of this renderer
+ */
+ @Inject
+ public RuleRepositoryLinkFeatureControlRenderer(VControl vElement, ViewModelContext viewContext,
+ ReportService reportService) {
+ super(vElement, viewContext, reportService);
+ }
+
+ @Override
+ protected EClass getRootEClass(Notifier notifier) {
+ final EObject eObject = (EObject) notifier;
+
+ final EList<Resource> resources = eObject.eResource().getResourceSet().getResources();
+ for (final Resource resource : resources) {
+ final EObject object = resource.getContents().get(0);
+ if (VView.class.isInstance(object)) {
+ return VView.class.cast(object).getRootEClass();
+ }
+ }
+ throw new IllegalStateException("Please select a view model first."); //$NON-NLS-1$
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryLinkFeatureControlRendererService.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryLinkFeatureControlRendererService.java
new file mode 100644
index 0000000..6c87674
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/RuleRepositoryLinkFeatureControlRendererService.java
@@ -0,0 +1,102 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling;
+
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedReport;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+/**
+ * DI renderer service for {@link RuleRepositoryLinkFeatureControlRenderer}.
+ *
+ * @author Lucas Koehler
+ *
+ */
+@Component
+public class RuleRepositoryLinkFeatureControlRendererService implements EMFFormsDIRendererService<VControl> {
+
+ private EMFFormsDatabinding databindingService;
+ private ReportService reportService;
+
+ /**
+ * Called by the framework to set the {@link EMFFormsDatabinding}.
+ *
+ * @param databindingService The {@link EMFFormsDatabinding}
+ */
+ @Reference(unbind = "-")
+ protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
+ this.databindingService = databindingService;
+ }
+
+ /**
+ * Called by the framework to set the {@link ReportService}.
+ *
+ * @param reportService The {@link ReportService}
+ */
+ @Reference(unbind = "-")
+ protected void setReportService(ReportService reportService) {
+ this.reportService = reportService;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#isApplicable(org.eclipse.emf.ecp.view.spi.model.VElement,
+ * org.eclipse.emf.ecp.view.spi.context.ViewModelContext)
+ */
+ @Override
+ public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+ if (!VControl.class.isInstance(vElement)) {
+ return NOT_APPLICABLE;
+ }
+ final VControl control = (VControl) vElement;
+ if (control.getDomainModelReference() == null) {
+ return NOT_APPLICABLE;
+ }
+ IValueProperty valueProperty;
+ try {
+ valueProperty = databindingService.getValueProperty(control.getDomainModelReference(),
+ viewModelContext.getDomainModel());
+ } catch (final DatabindingFailedException ex) {
+ reportService.report(new DatabindingFailedReport(ex));
+ return NOT_APPLICABLE;
+ }
+ final EStructuralFeature feature = (EStructuralFeature) valueProperty.getValueType();
+ if (VViewPackage.eINSTANCE.getFeaturePathDomainModelReference_DomainModelEFeature() == feature) {
+ return 10d;
+ }
+
+ return NOT_APPLICABLE;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#getRendererClass()
+ */
+ @Override
+ public Class<? extends AbstractSWTRenderer<VControl>> getRendererClass() {
+ return RuleRepositoryLinkFeatureControlRenderer.class;
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/merge/MergeHelper.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/merge/MergeHelper.java
new file mode 100644
index 0000000..255859f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/merge/MergeHelper.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling.merge;
+
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+
+/**
+ * Helper class to merge the linked View model with the rule repository into a new view model.
+ *
+ * @author Eugen Neufeld
+ *
+ */
+public final class MergeHelper {
+
+ private MergeHelper() {
+ }
+
+ /**
+ * Merges the {@link VRuleRepository} into the linked {@link org.eclipse.emf.ecp.view.spi.model.VView VView}.
+ *
+ * @param ruleRepository The {@link VRuleRepository} to merge from
+ */
+ public static void merge(VRuleRepository ruleRepository) {
+ for (final VRuleEntry ruleEntry : ruleRepository.getRuleEntries()) {
+ for (final VElement vElement : ruleEntry.getElements()) {
+ if (vElement.eIsProxy()) {
+ // FIXME: log error
+ continue;
+ }
+ vElement.getAttachments().add(EcoreUtil.copy(ruleEntry.getRule()));
+ }
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/merge/MergeWithViewHandler.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/merge/MergeWithViewHandler.java
new file mode 100644
index 0000000..d9d3b63
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/merge/MergeWithViewHandler.java
@@ -0,0 +1,141 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling.merge;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.view.spi.model.VView;
+import org.eclipse.emfforms.spi.editor.helpers.ResourceSetHelpers;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.TreeSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * The Handler that gets triggered when the merge of rule repository and view is triggered.
+ *
+ * @author Eugen Neufeld
+ *
+ */
+public class MergeWithViewHandler extends AbstractHandler {
+
+ private static final String ORG_ECLIPSE_EMFFORMS_RULEREPOSITORY_TOOLING = "org.eclipse.emfforms.rulerepository.tooling"; //$NON-NLS-1$
+
+ @Override
+ public Object execute(final ExecutionEvent event) throws ExecutionException {
+ final ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+ final Shell activeShell = HandlerUtil.getActiveShell(event);
+ final IFile selectedFile = (IFile) TreeSelection.class.cast(currentSelection).getFirstElement();
+ final WorkspaceModifyOperation operation = mergeRuleRepoWithView(activeShell, selectedFile);
+ try {
+ HandlerUtil.getActiveWorkbenchWindow(event).run(false, false, operation);
+ } catch (final InvocationTargetException ex) {
+ ErrorDialog.openError(activeShell, "Error", //$NON-NLS-1$
+ ex.getMessage(),
+ new Status(IStatus.ERROR, ORG_ECLIPSE_EMFFORMS_RULEREPOSITORY_TOOLING, ex.getMessage(), ex));
+ } catch (final InterruptedException ex) {
+ ErrorDialog.openError(activeShell, "Error", //$NON-NLS-1$
+ ex.getMessage(),
+ new Status(IStatus.ERROR, ORG_ECLIPSE_EMFFORMS_RULEREPOSITORY_TOOLING, ex.getMessage(), ex));
+ }
+ return null;
+ }
+
+ private WorkspaceModifyOperation mergeRuleRepoWithView(final Shell activeShell, final IFile selectedFile) {
+ final ResourceSet resourceSet = ResourceSetHelpers.loadResourceSetWithProxies(
+ URI.createPlatformResourceURI(selectedFile.getFullPath().toOSString(), false),
+ new BasicCommandStack());
+ VView view = null;
+ VRuleRepository ruleRepository = null;
+ for (final Resource resource : resourceSet.getResources()) {
+ final EObject eObject = resource.getContents().get(0);
+ if (VView.class.isInstance(eObject)) {
+ view = VView.class.cast(eObject);
+ }
+ if (VRuleRepository.class.isInstance(eObject)) {
+ ruleRepository = VRuleRepository.class.cast(eObject);
+ }
+ }
+ if (ruleRepository == null) {
+ ErrorDialog.openError(activeShell, "Missing Rule Repository", //$NON-NLS-1$
+ "The file doesn't contain a rule repository!", //$NON-NLS-1$
+ new Status(IStatus.ERROR, ORG_ECLIPSE_EMFFORMS_RULEREPOSITORY_TOOLING, "No Rule Repository!")); //$NON-NLS-1$
+ return null;
+ }
+ if (view == null) {
+ ErrorDialog.openError(activeShell, "Missing View", //$NON-NLS-1$
+ "You must link a view model first!", //$NON-NLS-1$
+ new Status(IStatus.ERROR, ORG_ECLIPSE_EMFFORMS_RULEREPOSITORY_TOOLING, "No View model linked!")); //$NON-NLS-1$
+ return null;
+ }
+
+ final SaveAsDialog sad = new SaveAsDialog(activeShell);
+ final int result = sad.open();
+ if (result == Window.CANCEL) {
+ return null;
+ }
+ MergeHelper.merge(ruleRepository);
+ final VView mergedView = EcoreUtil.copy(view);
+ // Do the work within an operation.
+ final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+ @Override
+ protected void execute(IProgressMonitor progressMonitor) {
+ // Create a resource set
+ final ResourceSet resourceSet = new ResourceSetImpl();
+
+ // Get the URI of the model file.
+ final URI fileURI = URI.createPlatformResourceURI(sad.getResult().toString(), true);
+
+ // Create a resource for this file.
+ final Resource resource = resourceSet.createResource(fileURI);
+
+ resource.getContents().add(mergedView);
+
+ // Save the contents of the resource to the file system.
+ // final Map<Object, Object> options = new HashMap<Object, Object>();
+ // options.put(XMLResource.OPTION_ENCODING, "UTF-8");
+ try {
+ resource.save(null);
+ } catch (final IOException ex) {
+ ErrorDialog.openError(activeShell, "Error", //$NON-NLS-1$
+ ex.getMessage(),
+ new Status(IStatus.ERROR, ORG_ECLIPSE_EMFFORMS_RULEREPOSITORY_TOOLING, ex.getMessage(), ex));
+ return;
+ } finally {
+ progressMonitor.done();
+ }
+ }
+ };
+ return operation;
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/EMFFormsNewRuleRepositoryWizardPage.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/EMFFormsNewRuleRepositoryWizardPage.java
new file mode 100644
index 0000000..11d53ca
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/EMFFormsNewRuleRepositoryWizardPage.java
@@ -0,0 +1,216 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling.wizard;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+
+/**
+ * The "New" wizard page allows setting the container for the new file as well
+ * as the file name. The page will only accept file name without the extension
+ * OR with the extension that matches the expected one (rulerepository).
+ */
+
+public class EMFFormsNewRuleRepositoryWizardPage extends WizardPage {
+ private Text containerText;
+
+ private Text fileText;
+
+ private final ISelection selection;
+
+ /**
+ * Constructor for SampleNewWizardPage.
+ *
+ * @param selection the current {@link ISelection}
+ */
+ public EMFFormsNewRuleRepositoryWizardPage(ISelection selection) {
+ super("wizardPage"); //$NON-NLS-1$
+ setTitle(Messages.EMFFormsRuleRepositoryWizardPage_title);
+ setDescription(Messages.EMFFormsRuleRepositoryWizardPage_description);
+ this.selection = selection;
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ final Composite container = new Composite(parent, SWT.NULL);
+ final GridLayout layout = new GridLayout();
+ container.setLayout(layout);
+ layout.numColumns = 3;
+ layout.verticalSpacing = 9;
+ Label label = new Label(container, SWT.NULL);
+ label.setText(Messages.EMFFormsRuleRepositoryWizardPage_containerSelection);
+
+ containerText = new Text(container, SWT.BORDER | SWT.SINGLE);
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ containerText.setLayoutData(gd);
+ containerText.addModifyListener(new ModifyListener() {
+ @Override
+ public void modifyText(ModifyEvent e) {
+ dialogChanged();
+ }
+ });
+
+ final Button button = new Button(container, SWT.PUSH);
+ button.setText(Messages.EMFFormsRuleRepositoryWizardPage_browseContainer);
+ button.addSelectionListener(new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ handleBrowse();
+ }
+ });
+ label = new Label(container, SWT.NULL);
+ label.setText(Messages.EMFFormsRuleRepositoryWizardPage_fileSelection);
+
+ fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ fileText.setLayoutData(gd);
+ fileText.addModifyListener(new ModifyListener() {
+ @Override
+ public void modifyText(ModifyEvent e) {
+ dialogChanged();
+ }
+ });
+ initialize();
+ dialogChanged();
+ setControl(container);
+ }
+
+ /**
+ * Tests if the current workbench selection is a suitable container to use.
+ */
+
+ private void initialize() {
+ if (selection != null && !selection.isEmpty()
+ && selection instanceof IStructuredSelection) {
+ final IStructuredSelection ssel = (IStructuredSelection) selection;
+ if (ssel.size() > 1) {
+ return;
+ }
+ final Object obj = ssel.getFirstElement();
+ if (obj instanceof IResource) {
+ IContainer container;
+ if (obj instanceof IContainer) {
+ container = (IContainer) obj;
+ } else {
+ container = ((IResource) obj).getParent();
+ }
+ containerText.setText(container.getFullPath().toString());
+ }
+ }
+ fileText.setText("new_file.rulerepository"); //$NON-NLS-1$
+ }
+
+ /**
+ * Uses the standard container selection dialog to choose the new value for
+ * the container field.
+ */
+
+ private void handleBrowse() {
+ final ContainerSelectionDialog dialog = new ContainerSelectionDialog(
+ getShell(), ResourcesPlugin.getWorkspace().getRoot(), false,
+ Messages.EMFFormsRuleRepositoryWizardPage_browseFile);
+ if (dialog.open() == Window.OK) {
+ final Object[] result = dialog.getResult();
+ if (result.length == 1) {
+ containerText.setText(((Path) result[0]).toString());
+ }
+ }
+ }
+
+ /**
+ * Ensures that both text fields are set.
+ */
+
+ private void dialogChanged() {
+ final IResource container = ResourcesPlugin.getWorkspace().getRoot()
+ .findMember(new Path(getContainerName()));
+ final String fileName = getFileName();
+
+ if (getContainerName().length() == 0) {
+ updateStatus(Messages.EMFFormsRuleRepositoryWizardPage_errorNoContainer);
+ return;
+ }
+ if (container == null
+ || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0) {
+ updateStatus(Messages.EMFFormsRuleRepositoryWizardPage_errorContainerNotExists);
+ return;
+ }
+ if (!container.isAccessible()) {
+ updateStatus(Messages.EMFFormsRuleRepositoryWizardPage_errorProjectReadOnly);
+ return;
+ }
+ if (fileName.length() == 0) {
+ updateStatus(Messages.EMFFormsRuleRepositoryWizardPage_errorNoFilename);
+ return;
+ }
+ if (fileName.replace('\\', '/').indexOf('/', 1) > 0) {
+ updateStatus(Messages.EMFFormsRuleRepositoryWizardPage_errorInvalidFilename);
+ return;
+ }
+
+ if (ResourcesPlugin.getWorkspace().getRoot().getFile(container.getFullPath().append(fileName)).exists()) {
+ updateStatus(String.format(Messages.EMFFormsRuleRepositoryWizardPage_FileAlreadyExist, fileName));
+ return;
+ }
+ final int dotLoc = fileName.lastIndexOf('.');
+ if (dotLoc != -1) {
+ final String ext = fileName.substring(dotLoc + 1);
+ if (!ext.equalsIgnoreCase("rulerepository")) { //$NON-NLS-1$
+ updateStatus(
+ String.format(Messages.EMFFormsRuleRepositoryWizardPage_errorWrongFileExtension, "rulerepository")); //$NON-NLS-1$
+ return;
+ }
+ }
+ updateStatus(null);
+ }
+
+ private void updateStatus(String message) {
+ setErrorMessage(message);
+ setPageComplete(message == null);
+ }
+
+ /**
+ * The container name.
+ *
+ * @return the name of the container
+ */
+ public String getContainerName() {
+ return containerText.getText();
+ }
+
+ /**
+ * The file name.
+ *
+ * @return the name of the file
+ */
+ public String getFileName() {
+ return fileText.getText();
+ }
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/EMFFormsRuleRepositoryWizard.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/EMFFormsRuleRepositoryWizard.java
new file mode 100644
index 0000000..a19f2b8
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/EMFFormsRuleRepositoryWizard.java
@@ -0,0 +1,187 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling.wizard;
+
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.emfforms.spi.rulerepository.model.VRuleRepository;
+import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryFactory;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+
+/**
+ * This is a sample new wizard. Its role is to create a new file
+ * resource in the provided container. If the container resource
+ * (a folder or a project) is selected in the workspace
+ * when the wizard is opened, it will accept it as the target
+ * container. The wizard creates one file with the extension
+ * "rulerepository". If a sample multi-page editor (also available
+ * as a template) is registered for the same extension, it will
+ * be able to open it.
+ */
+
+public class EMFFormsRuleRepositoryWizard extends Wizard implements INewWizard {
+
+ private ISelection selection;
+
+ private Optional<EMFFormsNewRuleRepositoryWizardPage> newPage = Optional.empty();
+
+ /**
+ * Constructor for EMFFormsRuleRepositoryWizard. This wizard allows you to create a new rulerepository model.
+ */
+ public EMFFormsRuleRepositoryWizard() {
+ super();
+ setNeedsProgressMonitor(true);
+ }
+
+ @Override
+ public void addPages() {
+
+ newPage = Optional.of(new EMFFormsNewRuleRepositoryWizardPage(selection));
+ addPage(newPage.get());
+
+ }
+
+ @Override
+ public IWizardPage getNextPage(IWizardPage page) {
+
+ /* if we allow to create a style (selector page is present) show the selector page after the new/select page */
+ if (newPage.isPresent() && page == newPage.get()) {
+ return null;
+ }
+
+ return super.getNextPage(page);
+ }
+
+ @Override
+ public boolean canFinish() {
+ return super.canFinish();
+ }
+
+ @Override
+ public boolean performFinish() {
+ return performFinishNewPage();
+ }
+
+ private boolean performFinishNewPage() {
+ final String containerName = newPage.get().getContainerName();
+ final String fileName = newPage.get().getFileName();
+ final IRunnableWithProgress op = new IRunnableWithProgress() {
+ @Override
+ public void run(IProgressMonitor monitor) throws InvocationTargetException {
+ try {
+ doFinish(containerName, fileName, monitor);
+ } catch (final CoreException e) {
+ throw new InvocationTargetException(e);
+ } finally {
+ monitor.done();
+ }
+ }
+ };
+ try {
+ getContainer().run(true, false, op);
+ } catch (final InterruptedException e) {
+ return false;
+ } catch (final InvocationTargetException e) {
+ final Throwable realException = e.getTargetException();
+ MessageDialog.openError(getShell(), Messages.EMFFormsRuleRepositoryWizard_errorTitle,
+ realException.getMessage());
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * The worker method. It will find the container, create the
+ * file if missing or just replace its contents, and open
+ * the editor on the newly created file.
+ */
+
+ private void doFinish(String containerName, String fileName, final IProgressMonitor monitor) throws CoreException {
+ // create a sample file
+ monitor.beginTask(Messages.EMFFormsRuleRepositoryWizard_creatingTask + fileName, 2);
+ final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+ final IResource resource = root.findMember(new Path(containerName));
+ if (!resource.exists() || !(resource instanceof IContainer)) {
+ throwCoreException(String.format("Container \"%s\" does not exist.", containerName)); //$NON-NLS-1$
+ }
+ final IContainer container = (IContainer) resource;
+ final IFile file = container.getFile(new Path(fileName));
+ try {
+ final VRuleRepository ruleRepository = VRulerepositoryFactory.eINSTANCE.createRuleRepository();
+
+ final ResourceSet rs = new ResourceSetImpl();
+ final Resource ruleRepositoryResource = rs.createResource(URI.createURI(file.getLocationURI().toString()));
+ ruleRepositoryResource.getContents().add(ruleRepository);
+ ruleRepositoryResource.save(null);
+ container.refreshLocal(IResource.DEPTH_ONE, monitor);
+ } catch (final IOException e) {
+ MessageDialog.openError(getShell(), "Error", e.getMessage()); //$NON-NLS-1$
+ monitor.done();
+ return;
+ }
+ monitor.worked(1);
+ monitor.setTaskName(Messages.EMFFormsRuleRepositoryWizard_editingTask);
+ getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ try {
+ IDE.openEditor(page, file, true);
+ } catch (final PartInitException e) {
+ MessageDialog.openError(getShell(), "Error", e.getMessage()); //$NON-NLS-1$
+ monitor.done();
+ return;
+ }
+ }
+ });
+ monitor.worked(1);
+ }
+
+ private void throwCoreException(String message) throws CoreException {
+ final IStatus status = new Status(IStatus.ERROR, "org.eclipse.emfforms.rulerepository.tooling", IStatus.OK, //$NON-NLS-1$
+ message, null);
+ throw new CoreException(status);
+ }
+
+ @Override
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ this.selection = selection;
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/Messages.java b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/Messages.java
new file mode 100644
index 0000000..42e662e
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/Messages.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld- initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.rulerepository.tooling.wizard;
+
+import org.eclipse.osgi.util.NLS;
+
+/**
+ * Messages file.
+ *
+ * @generated
+ *
+ * @author Eugen Neufeld
+ *
+ */
+public final class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.emfforms.internal.rulerepository.tooling.wizard.messages"; //$NON-NLS-1$
+ public static String EMFFormsRuleRepositoryWizard_creatingTask;
+ public static String EMFFormsRuleRepositoryWizard_editingTask;
+ public static String EMFFormsRuleRepositoryWizard_errorTitle;
+ public static String EMFFormsRuleRepositoryWizardPage_browseContainer;
+ public static String EMFFormsRuleRepositoryWizardPage_browseFile;
+ public static String EMFFormsRuleRepositoryWizardPage_containerSelection;
+ public static String EMFFormsRuleRepositoryWizardPage_description;
+ public static String EMFFormsRuleRepositoryWizardPage_errorContainerNotExists;
+ public static String EMFFormsRuleRepositoryWizardPage_errorInvalidFilename;
+ public static String EMFFormsRuleRepositoryWizardPage_errorNoContainer;
+ public static String EMFFormsRuleRepositoryWizardPage_errorNoFilename;
+ public static String EMFFormsRuleRepositoryWizardPage_errorProjectReadOnly;
+ public static String EMFFormsRuleRepositoryWizardPage_errorWrongFileExtension;
+ public static String EMFFormsRuleRepositoryWizardPage_FileAlreadyExist;
+ public static String EMFFormsRuleRepositoryWizardPage_fileSelection;
+ public static String EMFFormsRuleRepositoryWizardPage_title;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/messages.properties b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/messages.properties
new file mode 100644
index 0000000..1f179a1
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/src/org/eclipse/emfforms/internal/rulerepository/tooling/wizard/messages.properties
@@ -0,0 +1,16 @@
+EMFFormsRuleRepositoryWizard_creatingTask=Creating
+EMFFormsRuleRepositoryWizard_editingTask=Opening file for editing...
+EMFFormsRuleRepositoryWizard_errorTitle=Error
+EMFFormsRuleRepositoryWizardPage_browseContainer=Browse...
+EMFFormsRuleRepositoryWizardPage_browseFile=Select new file container
+EMFFormsRuleRepositoryWizardPage_containerSelection=&Container:
+EMFFormsRuleRepositoryWizardPage_description=This wizard creates a new file with *.rulerepository extension that can be opened by a multi-page editor.
+EMFFormsRuleRepositoryWizardPage_errorContainerNotExists=File container must exist
+EMFFormsRuleRepositoryWizardPage_errorInvalidFilename=File name must be valid
+EMFFormsRuleRepositoryWizardPage_errorNoContainer=File container must be specified
+EMFFormsRuleRepositoryWizardPage_errorNoFilename=File name must be specified
+EMFFormsRuleRepositoryWizardPage_errorProjectReadOnly=Project must be writable
+EMFFormsRuleRepositoryWizardPage_errorWrongFileExtension=File extension must be "%s"
+EMFFormsRuleRepositoryWizardPage_FileAlreadyExist=%s already exists.
+EMFFormsRuleRepositoryWizardPage_fileSelection=&File name:
+EMFFormsRuleRepositoryWizardPage_title=Multi-page Editor File
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
index 90c423e..ac7f0bb 100644
--- a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
@@ -2,47 +2,47 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Base Dependencies
Bundle-SymbolicName: org.eclipse.emfforms.setup.base
-Bundle-Version: 1.9.0.qualifier
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.9.0,2.0.0)"
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.10.0,2.0.0)"
diff --git a/bundles/org.eclipse.emfforms.setup.base/pom.xml b/bundles/org.eclipse.emfforms.setup.base/pom.xml
index 5cce86a..045d50b 100644
--- a/bundles/org.eclipse.emfforms.setup.base/pom.xml
+++ b/bundles/org.eclipse.emfforms.setup.base/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
index b16a055..3f1c5b6 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Categorization renderer using an Expandbar
Bundle-SymbolicName: org.eclipse.emfforms.swt.categorization.expandbar
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
org.eclipse.rap.rwt;bundle-version="[3.0.2,4.0.0)",
org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.categorization.expandbar.CategorizationElementExpandBarRendererService.xml
Import-Package: javax.inject;version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;version="1.9.0",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="1.9.0",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.10.0,2.0.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.10.0,2.0.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",
org.eclipse.jface.viewers;version="0.0.0",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
+Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.categorization.expandbar.CategorizationElementExpandBarRendererService.xml
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.9.0";x-internal:=true
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
index dce0f25..90ae8ba 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.categorization.expandbar</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.swt.control.multiattribute/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
index 100bf8b..9e8247b 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Renderer for Multi EAttributes
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.multiattribute;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.control.multiattribute;version="1.9.0",
- org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.control.multiattribute;version="1.10.0",
+ org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
org.eclipse.core.runtime;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml b/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
index 7fbaa3c..5138a2a 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.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.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/MultiAttributeRendererService.java b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/MultiAttributeRendererService.java
index cbffa4d..e333df0 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/MultiAttributeRendererService.java
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/internal/view/control/multiattribute/MultiAttributeRendererService.java
@@ -48,7 +48,7 @@
*
* @param databindingService The EMFFormsDatabinding
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
protected void setEMFFormsDatabinding(EMFFormsDatabinding databindingService) {
this.databindingService = databindingService;
}
@@ -58,7 +58,7 @@
*
* @param reportService The ReportService
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
index 12614b2..09a9b46 100644
--- a/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.control.multiattribute/src/org/eclipse/emfforms/spi/view/control/multiattribute/MultiAttributeSWTRenderer.java
@@ -71,6 +71,7 @@
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.EditingSupport;
import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
@@ -540,10 +541,10 @@
final EAttribute attribute = EAttribute.class.cast(list.getElementType());
final EditingDomain editingDomain = getEditingDomain(eObject);
- final int currentIndex = tableViewer.getTable().getSelectionIndex();
- if (currentIndex >= 0) {
+ final IStructuredSelection selection = tableViewer.getStructuredSelection();
+ if (!selection.isEmpty()) {
editingDomain.getCommandStack().execute(RemoveCommand.create(editingDomain, eObject, attribute,
- tableViewer.getElementAt(currentIndex)));
+ selection.toList()));
}
}
}
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
index 4237c5d..7599414 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Text Control with Autocomplete
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
index ae78b1a..4861bb3 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRendererService.java b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRendererService.java
index 2a5cdbb..59e7603 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRendererService.java
+++ b/bundles/org.eclipse.emfforms.swt.control.text.autocomplete/src/org/eclipse/emfforms/internal/swt/control/text/autocomplete/renderer/AutocompleteTextControlSWTRendererService.java
@@ -45,7 +45,7 @@
*
* @param databinding service
*/
- @Reference
+ @Reference(unbind = "-")
public void setDatabinding(EMFFormsDatabinding databinding) {
this.databinding = databinding;
}
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.checkstyle b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.checkstyle
new file mode 100644
index 0000000..19c5477
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.checkstyle
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="ESMCheckstyle" location="/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="Java Files" enabled="true" check-config-name="ESMCheckstyle" local="true">
+ <file-match-pattern match-pattern=".java" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.classpath b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.classpath
new file mode 100644
index 0000000..ad32c83
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.project b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.project
new file mode 100644
index 0000000..8cd1bd2
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.project
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.swt.control.text.richtext</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.wuetherich.osgi.ds.annotations.dsAnnotationBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>com.wuetherich.osgi.ds.annotations.dsAnnotationNature</nature>
+ </natures>
+</projectDescription>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..66c53c1
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,419 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8bc4bb4
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.api.tools.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..2a7a9c5
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
@@ -0,0 +1,34 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMFForms SWT Rich Text Control
+Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.richtext;singleton:=true
+Bundle-Version: 1.10.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: javax.inject;version="1.0.0",
+ org.eclipse.jface.databinding.swt;version="0.0.0",
+ org.eclipse.jface.databinding.viewers;version="0.0.0",
+ org.eclipse.jface.fieldassist;version="0.0.0",
+ org.eclipse.jface.layout;version="0.0.0",
+ org.eclipse.jface.viewers;version="0.0.0",
+ org.eclipse.swt;version="0.0.0",
+ org.eclipse.swt.events;version="0.0.0",
+ org.eclipse.swt.graphics;version="0.0.0",
+ org.eclipse.swt.layout;version="0.0.0",
+ org.eclipse.swt.widgets;version="0.0.0",
+ org.osgi.framework;version="0.0.0",
+ org.osgi.service.component.annotations;version="0.0.0";resolution:=optional
+Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService.xml
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/.gitignore b/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/.gitignore
new file mode 100644
index 0000000..949933c
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService.xml
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..c8451bc
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2013-2015 EclipseSource.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# EclipseSource - initial API and implementation
+################################################################################
+
+AutocompleteTextControlSWTRenderer_Set=No text set\! Click to set text.
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService.xml b/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService.xml
new file mode 100644
index 0000000..9e8697b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/OSGI-INF/org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/swt/control/text/richtext/renderer/RichTextControlSWTRendererService.java]-->
+<scr:component name="org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
+ <implementation class="org.eclipse.emfforms.internal.swt.control.text.richtext.renderer.RichTextControlSWTRendererService"/>
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
+ </service>
+ <reference name="Databinding" interface="org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding" bind="setDatabinding"/>
+ <reference name="EMFFormsEditSupport" interface="org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport" bind="setEMFFormsEditSupport"/>
+</scr:component>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.html b/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.ini b/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.ini
new file mode 100644
index 0000000..911c4c7
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.mappings b/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.mappings
new file mode 100644
index 0000000..f2954d5
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/about.mappings
@@ -0,0 +1,6 @@
+# about.mappings
+# contains fill-ins for about.properties
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file does not need to be translated.
+
+0=${BUILD_ID}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/build.properties b/bundles/org.eclipse.emfforms.swt.control.text.richtext/build.properties
new file mode 100644
index 0000000..b0a27d9
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/build.properties
@@ -0,0 +1,10 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ about.html,\
+ OSGI-INF/,\
+ about.ini,\
+ about.mappings,\
+ modeling32.png
+src.includes = about.html
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/modeling32.png b/bundles/org.eclipse.emfforms.swt.control.text.richtext/modeling32.png
new file mode 100644
index 0000000..6b08de2
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/modeling32.png
Binary files differ
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
new file mode 100644
index 0000000..af596b0
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-bundles-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.emfforms.swt.control.text.richtext</artifactId>
+<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/internal/swt/control/text/richtext/renderer/RichTextControlSWTRendererService.java b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/internal/swt/control/text/richtext/renderer/RichTextControlSWTRendererService.java
new file mode 100644
index 0000000..ad77d76
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/internal/swt/control/text/richtext/renderer/RichTextControlSWTRendererService.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;
+
+import org.eclipse.core.databinding.property.value.IValueProperty;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.spi.model.VElement;
+import org.eclipse.emfforms.spi.core.services.databinding.DatabindingFailedException;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.swt.control.text.richtext.renderer.RichTextControlSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.AbstractSWTRenderer;
+import org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
+/**
+ * {@link EMFFormsDIRendererService Renderer service} for the {@link RichTextControlSWTRenderer}.
+ *
+ * @author jfaltermeier
+ *
+ */
+@Component
+public class RichTextControlSWTRendererService implements EMFFormsDIRendererService<VControl> {
+
+ private static final String ANNOTATION_SOURCE = "org.eclipse.emfforms"; //$NON-NLS-1$
+ private static final String ANNOTATION_KEY = "autocomplete"; //$NON-NLS-1$
+ private static final String ANNOTATION_VALUE = "true"; //$NON-NLS-1$
+
+ private EMFFormsDatabinding databinding;
+ private EMFFormsEditSupport emfFormsEditSupport;
+
+ /**
+ * Sets the {@link EMFFormsDatabinding} service.
+ *
+ * @param databinding service
+ */
+ @Reference(unbind = "-")
+ public void setDatabinding(EMFFormsDatabinding databinding) {
+ this.databinding = databinding;
+ }
+
+ /**
+ * Sets the {@link EMFFormsEditSupport}.
+ *
+ * @param emfFormsEditSupport {@link EMFFormsEditSupport}
+ */
+ @Reference(unbind = "-")
+ public void setEMFFormsEditSupport(EMFFormsEditSupport emfFormsEditSupport) {
+ this.emfFormsEditSupport = emfFormsEditSupport;
+
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#isApplicable(org.eclipse.emf.ecp.view.spi.model.VElement,
+ * org.eclipse.emf.ecp.view.spi.context.ViewModelContext)
+ */
+ @Override
+ public double isApplicable(VElement vElement, ViewModelContext viewModelContext) {
+ try {
+ if (!VControl.class.isInstance(vElement)) {
+ return NOT_APPLICABLE;
+ }
+
+ final VControl control = VControl.class.cast(vElement);
+
+ if (control.getDomainModelReference() == null) {
+ return NOT_APPLICABLE;
+ }
+
+ @SuppressWarnings("rawtypes")
+ final IValueProperty valueProperty = databinding.getValueProperty(control.getDomainModelReference(),
+ viewModelContext.getDomainModel());
+ final EStructuralFeature feature = EStructuralFeature.class.cast(valueProperty.getValueType());
+
+ if (feature.isMany()) {
+ return NOT_APPLICABLE;
+ }
+
+ if (!EAttribute.class.isInstance(feature)) {
+ return NOT_APPLICABLE;
+ }
+
+ final EAttribute attribute = EAttribute.class.cast(feature);
+ final Class<?> instanceClass = attribute.getEAttributeType().getInstanceClass();
+ if (instanceClass == null) {
+ return NOT_APPLICABLE;
+ }
+
+ if (!String.class.isAssignableFrom(instanceClass)) {
+ return NOT_APPLICABLE;
+ }
+
+ if (emfFormsEditSupport.isMultiLine(control.getDomainModelReference(), viewModelContext.getDomainModel())) {
+ return 10;
+ }
+
+ } catch (final DatabindingFailedException ex) {
+ return NOT_APPLICABLE;
+ }
+
+ return NOT_APPLICABLE;
+ }
+
+ /**
+ * Checks whether the given feature has an autocomplete annotation which is set to true.
+ *
+ * @param feature the feature to check
+ * @return <code>true</code> if autocomplete should be used, <code>false</code> othwise
+ */
+ boolean hasAutoCompleteAnnotation(EStructuralFeature feature) {
+ final String annotation = EcoreUtil.getAnnotation(feature, ANNOTATION_SOURCE, ANNOTATION_KEY);
+ if (annotation == null) {
+ return false;
+ }
+ return ANNOTATION_VALUE.equalsIgnoreCase(annotation);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService#getRendererClass()
+ */
+ @Override
+ public Class<? extends AbstractSWTRenderer<VControl>> getRendererClass() {
+ return RichTextControlSWTRenderer.class;
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
new file mode 100644
index 0000000..adb8955
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2015 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;
+
+import javax.inject.Inject;
+
+import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
+import org.eclipse.emf.ecp.view.spi.core.swt.renderer.TextControlSWTRenderer;
+import org.eclipse.emf.ecp.view.spi.model.VControl;
+import org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider;
+import org.eclipse.emfforms.spi.common.report.ReportService;
+import org.eclipse.emfforms.spi.core.services.databinding.EMFFormsDatabinding;
+import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
+import org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider;
+import org.eclipse.emfforms.spi.swt.core.layout.EMFFormsSWTLayoutUtil;
+import org.eclipse.emfforms.spi.swt.core.util.PopupWindow;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * The text control renderer allows to enter text while given autocompletion proposals. Moreover it is possible to
+ * select a proposed value from a combo box.
+ *
+ * @author jfaltermeier
+ *
+ */
+public class RichTextControlSWTRenderer extends TextControlSWTRenderer {
+ private GridData textGridData;
+ private Text text;
+
+ /**
+ * @author jonas
+ *
+ */
+ private final class OpenPopupHandler implements MouseListener {
+ private final Text text;
+
+ private OpenPopupHandler(Text text) {
+ this.text = text;
+ }
+
+ @Override
+ public void mouseUp(MouseEvent e) {
+ // do nothing
+ }
+
+ @Override
+ public void mouseDown(MouseEvent e) {
+
+ final PopupWindow popupWindow = createPopupWindow();
+
+ final Text innerText = new Text(popupWindow.getContent(),
+ SWT.MULTI | SWT.WRAP | SWT.V_SCROLL | SWT.H_SCROLL);
+ final GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+ layoutData.heightHint = getPreferrredPopupHeight();
+ innerText.setLayoutData(layoutData);
+ innerText.setSize(300, getPreferrredPopupHeight());
+ popupWindow.getContent().pack();
+ innerText.setText(text.getText());
+ innerText.setSelection(text.getCaretPosition());
+
+ innerText.addFocusListener(new FocusListener() {
+ @Override
+ public void focusLost(FocusEvent e) {
+ popupWindow.close();
+ }
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ // do nothing
+ }
+ });
+ innerText.addDisposeListener(new DisposeListener() {
+
+ @Override
+ public void widgetDisposed(DisposeEvent e) {
+ text.setText(innerText.getText());
+ }
+ });
+ popupWindow.open();
+
+ }
+
+ @Override
+ public void mouseDoubleClick(MouseEvent e) {
+ // do nothing
+ }
+ }
+
+ /**
+ * Specifies the preferred size of the popup window.
+ *
+ * @return the size in pixel
+ */
+ protected int getPreferrredPopupHeight() {
+ return 450;
+ }
+
+ /**
+ * creates the popup window.
+ *
+ * @return a new {@link PopupWindow}
+ */
+ protected PopupWindow createPopupWindow() {
+ return new PopupWindow(text, getPreferrredPopupHeight(), SWT.RESIZE, true);
+ }
+
+ /**
+ * Constructs a new {@link RichTextControlSWTRenderer}.
+ *
+ * @param vElement the view model element to be rendered
+ * @param viewContext the view context
+ * @param reportService The {@link ReportService}
+ * @param emfFormsDatabinding The {@link EMFFormsDatabinding}
+ * @param emfFormsLabelProvider The {@link EMFFormsLabelProvider}
+ * @param vtViewTemplateProvider The {@link VTViewTemplateProvider}
+ * @param emfFormsEditSupport The {@link EMFFormsEditSupport}
+ */
+ @Inject
+ public RichTextControlSWTRenderer(
+ VControl vElement,
+ ViewModelContext viewContext,
+ ReportService reportService,
+ EMFFormsDatabinding emfFormsDatabinding,
+ EMFFormsLabelProvider emfFormsLabelProvider,
+ VTViewTemplateProvider vtViewTemplateProvider, EMFFormsEditSupport emfFormsEditSupport) {
+ super(vElement, viewContext, reportService, emfFormsDatabinding, emfFormsLabelProvider, vtViewTemplateProvider,
+ emfFormsEditSupport);
+ }
+
+ @Override
+ protected Control createSWTControl(Composite parent) {
+ final Composite composite = new Composite(parent, SWT.NONE);
+ GridLayoutFactory.fillDefaults().numColumns(1).equalWidth(true).applyTo(composite);
+ text = new Text(composite, getTextWidgetStyle());
+ text.setData(CUSTOM_VARIANT, getTextVariantID());
+ text.setEditable(false);
+ text.setMessage(getTextMessage());
+ final GridDataFactory gdf = GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER)
+ .grab(true, true).span(1, 1);
+ final EMFFormsEditSupport editSupport = getEMFFormsEditSupport();
+ if (editSupport.isMultiLine(getVElement().getDomainModelReference(), getViewModelContext().getDomainModel())) {
+ gdf.hint(50, getTextHeightHint());// set x hint to enable wrapping
+ }
+ textGridData = gdf.create();
+ text.setLayoutData(textGridData);
+ text.addMouseListener(new OpenPopupHandler(text));
+ text.addModifyListener(new ModifyListener() {
+
+ @Override
+ public void modifyText(ModifyEvent e) {
+ textGridData.heightHint = getTextHeightHint();
+ text.setLayoutData(textGridData);
+ EMFFormsSWTLayoutUtil.adjustParentSize(text);
+
+ }
+ });
+ return composite;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.core.swt.AbstractControlSWTRenderer#postInit()
+ */
+ @Override
+ protected void postInit() {
+ // TODO Auto-generated method stub
+ super.postInit();
+ }
+
+ /**
+ * The preferred height in pixels for the text control.
+ *
+ * @return the height hint
+ * @see GridData#heightHint
+ */
+ protected int getTextHeightHint() {
+ if (text == null || text.isDisposed()) {
+ return -1;
+ }
+ final int lineCount = text.getLineCount();
+ int height = lineCount * text.getLineHeight();
+ final int maxHeight = getMaxTextHeight();
+ final int minHeight = getMinTextHeight();
+ if (height > maxHeight) {
+ height = maxHeight;
+ } else if (height < minHeight) {
+ height = minHeight;
+ }
+ return height;
+ }
+
+ /**
+ * The maximum height in pixels for the text control.
+ *
+ * @return the maximum height
+ */
+ protected int getMaxTextHeight() {
+ if (text == null || text.isDisposed()) {
+ return -1;
+ }
+ return getMaxVisibleLines() * text.getLineHeight();
+ }
+
+ /**
+ * The minimum height in pixels for the text control.
+ *
+ * @return the minimum height
+ */
+ protected int getMinTextHeight() {
+ if (text == null || text.isDisposed()) {
+ return -1;
+ }
+ return getMinVisibleLines() * text.getLineHeight();
+ }
+
+ /**
+ * The minimum number of visible lines in the text control.
+ *
+ * @return the minimum visible lines
+ */
+ protected int getMinVisibleLines() {
+ return 2;
+ }
+
+ /**
+ * The maximum number of visible lines in the text control.
+ *
+ * @return the maximum visible lines
+ */
+ protected int getMaxVisibleLines() {
+ return 10;
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
index f177d35..a014017 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Control Grid SWT Renderer
Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.9.0"
-Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.10.0"
+Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.10.0,2.0.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml b/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
index 053ca16..76c86e7 100644
--- a/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.controlgrid/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
index 6e96477..e319fc0 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.di.extension/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: SWT Core DI Extension
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/emfFormsDIExtensionRendererFactory.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml b/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
index 3fbe270..3b1baa6 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.di.extension/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.swt.core.di.extension</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
index 0567ccd..76cbe6a 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.di/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core DI
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core.di;version="1.9.0"
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core.di;version="1.10.0"
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.0,2.0.0)",
org.eclipse.e4.core.di;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
Service-Component: OSGI-INF/emfFormsDIRendererFactory.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.core.di/pom.xml b/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
index e352865..7f60c66 100644
--- a/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.di/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.swt.core.di</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emfforms.swt.core.plugin/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
index e3c7bd4..2316b42 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core Plugin
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.plugin
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.0.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.swt.core.plugin.LegacyAdditionalRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.swt.core.plugin.LegacyRendererService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml b/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
index b62f1a9..560ed63 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyAdditionalRendererService.java b/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyAdditionalRendererService.java
index 4c61bbb..4a0cb03 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyAdditionalRendererService.java
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyAdditionalRendererService.java
@@ -56,7 +56,7 @@
*
* @param reportService The ReportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -82,7 +82,7 @@
try {
final Class<AbstractAdditionalSWTRenderer<VElement>> renderer = loadClass(configurationElement
.getContributor().getName(), configurationElement
- .getAttribute("renderer")); //$NON-NLS-1$
+ .getAttribute("renderer")); //$NON-NLS-1$
final ECPAdditionalRendererTester tester = (ECPAdditionalRendererTester) configurationElement
.createExecutableExtension("tester"); //$NON-NLS-1$
legacyRenderer.put(tester, renderer);
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyRendererService.java b/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyRendererService.java
index ab84b05..553152f 100644
--- a/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyRendererService.java
+++ b/bundles/org.eclipse.emfforms.swt.core.plugin/src/org/eclipse/emfforms/internal/swt/core/plugin/LegacyRendererService.java
@@ -66,7 +66,7 @@
*
* @param reportService The ReportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -91,14 +91,13 @@
try {
final Class<AbstractSWTRenderer<VElement>> renderer = loadClass(configurationElement
.getContributor().getName(), configurationElement
- .getAttribute("renderer")); //$NON-NLS-1$
+ .getAttribute("renderer")); //$NON-NLS-1$
final Set<ECPRendererTester> tester = new LinkedHashSet<ECPRendererTester>();
for (final IConfigurationElement testerExtension : configurationElement.getChildren()) {
if (TEST_DYNAMIC.equals(testerExtension.getName())) {
tester.add((ECPRendererTester) testerExtension.createExecutableExtension(RENDERER_TESTER));
- }
- else if (TEST_STATIC.equals(testerExtension.getName())) {
+ } else if (TEST_STATIC.equals(testerExtension.getName())) {
final int priority = Integer.parseInt(testerExtension.getAttribute(TESTER_PRIORITY));
diff --git a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
index c658584..8e0f267 100644
--- a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
@@ -2,22 +2,24 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core
Bundle-SymbolicName: org.eclipse.emfforms.swt.core
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.9.0",
- org.eclipse.emfforms.spi.swt.core.data;version="1.9.0",
- org.eclipse.emfforms.spi.swt.core.layout;version="1.9.0",
- org.eclipse.emfforms.swt.core;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.core.data;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.core.layout;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.core.util;version="1.10.0",
+ org.eclipse.emfforms.swt.core;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.custom;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.core/pom.xml b/bundles/org.eclipse.emfforms.swt.core/pom.xml
index 1aacf80..740ab3b 100644
--- a/bundles/org.eclipse.emfforms.swt.core/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/util/PopupWindow.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/util/PopupWindow.java
new file mode 100644
index 0000000..a3e3bd6
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/util/PopupWindow.java
@@ -0,0 +1,130 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandra Buzila- initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.core.util;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * Control used for displaying a popup shell.
+ *
+ * @author Alexandra Buzila
+ * @since 1.10
+ *
+ */
+public class PopupWindow {
+ private Composite content;
+ private final Shell shell;
+
+ /**
+ * Creates a new resizable popup window, with size and location relative to the reference control.
+ *
+ * @param control the reference control
+ * @param maxHeight the maxHeight of the window
+ */
+ public PopupWindow(final Control control, int maxHeight) {
+ this(control, maxHeight, SWT.RESIZE);
+ }
+
+ /**
+ * Creates a new resizable popup window, with size and location relative to the reference control.
+ *
+ * @param control the reference control
+ * @param maxHeight the maximum height of the window
+ * @param style the style of the window
+ */
+ public PopupWindow(final Control control, int maxHeight, int style) {
+ Assert.isNotNull(control);
+ shell = new Shell(control.getShell(), style);
+ configurePopupWindow(control, maxHeight, false);
+ }
+
+ /**
+ * Creates a new resizable popup window, with size and location relative to the reference control.
+ *
+ * @param control the reference control
+ * @param maxHeight the maximum height of the window
+ * @param style the style of the window
+ * @param stretchUp If the window does not fit on screen vertically, it will stretch up to reach the maxHeight
+ */
+ public PopupWindow(final Control control, int maxHeight, int style, boolean stretchUp) {
+ Assert.isNotNull(control);
+ shell = new Shell(control.getShell(), style);
+ configurePopupWindow(control, maxHeight, stretchUp);
+ }
+
+ /**
+ * Configures the site, layout and location of the popup.
+ *
+ * @param control the reference control
+ * @param maxHeight the maximum height of the window
+ * @param stretchUp If the window does not fit on screen vertically, it will stretch up to reach the maxHeight
+ */
+ protected void configurePopupWindow(final Control control, int maxHeight, boolean stretchUp) {
+ final Point location = control.toDisplay(0, 0);
+ final Shell parentShell = control.getShell();
+ final Rectangle clientArea = control.getShell().getClientArea();
+ final Point bottomRight = parentShell.toDisplay(clientArea.width, clientArea.height);
+ final int distanceToScreenBottom = bottomRight.y - location.y;
+ int verticalMoveUp = 0;
+ int shellHeight = maxHeight;
+ if (distanceToScreenBottom < maxHeight) {
+ if (!stretchUp) {
+ shellHeight = Math.min(maxHeight, distanceToScreenBottom);
+ } else {
+ verticalMoveUp = maxHeight - distanceToScreenBottom;
+ }
+
+ }
+ shell.setSize(control.getSize().x, shellHeight);
+ shell.setLayout(new FillLayout());
+ shell.setLocation(location.x - 4, location.y - 4 - verticalMoveUp);// compensate for shell's margins
+ }
+
+ /**
+ * Returns the content {@link Composite} of the popup, which clients may use.
+ *
+ * @return the content {@link Composite}.
+ */
+ public Composite getContent() {
+ if (content == null) {
+ content = new Composite(shell, SWT.NONE);
+ content.setLayout(new GridLayout());
+ }
+ return content;
+ }
+
+ /**
+ * Opens the popup window.
+ *
+ * @see Shell#open()
+ */
+ public void open() {
+ shell.open();
+ }
+
+ /**
+ * Closes the popup window.
+ *
+ * @see Shell#close()
+ */
+ public void close() {
+ shell.close();
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
index d193323..b0f8aa5 100644
--- a/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.table/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table
Bundle-SymbolicName: org.eclipse.emfforms.swt.table
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.messages;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.util;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.9.0",
- org.eclipse.emfforms.spi.swt.table.util;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.messages;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.table.util;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.10.0,2.0.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.table/pom.xml b/bundles/org.eclipse.emfforms.swt.table/pom.xml
index bab43f2..b68f0dc 100644
--- a/bundles/org.eclipse.emfforms.swt.table/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.table/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.table</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java
index 41ca08d..8f9ff51 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/DefaultTableControlSWTCustomization.java
@@ -24,6 +24,7 @@
import org.eclipse.emfforms.spi.swt.table.TableViewerCreator;
import org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization;
import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerComparator;
@@ -95,7 +96,7 @@
}
@Override
- public TableViewer createTableViewer(Composite parent) {
+ public AbstractTableViewer createTableViewer(Composite parent) {
return tableViewerCreator.createTableViewer(parent);
}
@@ -110,7 +111,7 @@
}
@Override
- public void fillButtonComposite(Composite buttonComposite, TableViewer viewer) {
+ public void fillButtonComposite(Composite buttonComposite, AbstractTableViewer viewer) {
buttonBarBuilder.fillButtonComposite(buttonComposite, viewer);
}
@@ -219,7 +220,7 @@
}
@Override
- public DragSourceListener getDragListener(TableViewer tableViewer) {
+ public DragSourceListener getDragListener(AbstractTableViewer tableViewer) {
return dndProvider.getDragListener(tableViewer);
}
@@ -234,7 +235,7 @@
}
@Override
- public DropTargetListener getDropListener(TableViewer tableViewer) {
+ public DropTargetListener getDropListener(AbstractTableViewer tableViewer) {
return dndProvider.getDropListener(tableViewer);
}
@@ -261,7 +262,7 @@
}
@Override
- public DropTargetListener getDropListener(TableViewer tableViewer) {
+ public DropTargetListener getDropListener(AbstractTableViewer tableViewer) {
throw new UnsupportedOperationException();
}
@@ -276,7 +277,7 @@
}
@Override
- public DragSourceListener getDragListener(TableViewer tableViewer) {
+ public DragSourceListener getDragListener(AbstractTableViewer tableViewer) {
throw new UnsupportedOperationException();
}
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/StaticCellLabelProviderFactory.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/StaticCellLabelProviderFactory.java
index 80f65cf..7d070c4 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/StaticCellLabelProviderFactory.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/internal/swt/table/util/StaticCellLabelProviderFactory.java
@@ -12,8 +12,8 @@
package org.eclipse.emfforms.internal.swt.table.util;
import org.eclipse.emfforms.spi.swt.table.CellLabelProviderFactory;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.CellLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
/**
* Returns a previously created provider.
@@ -27,7 +27,7 @@
/**
* Constructs a new {@link StaticCellLabelProviderFactory} with the given provider.
- *
+ *
* @param provider the provider
*/
public StaticCellLabelProviderFactory(CellLabelProvider provider) {
@@ -35,7 +35,7 @@
}
@Override
- public CellLabelProvider createCellLabelProvider(TableViewer table) {
+ public CellLabelProvider createCellLabelProvider(AbstractTableViewer table) {
return provider;
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
new file mode 100644
index 0000000..e6a877b
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
@@ -0,0 +1,265 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.table;
+
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.emf.databinding.EMFDataBindingContext;
+import org.eclipse.emfforms.common.Optional;
+import org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization.ColumnDescription;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.layout.AbstractColumnLayout;
+import org.eclipse.jface.viewers.AbstractTableViewer;
+import org.eclipse.jface.viewers.ColumnPixelData;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
+import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
+import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ViewerColumn;
+import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Widget;
+
+/**
+ * @author Jonas Helming
+ *
+ */
+public abstract class AbstractTableViewerComposite extends Composite {
+ /** Data key for resizable columns. */
+ protected static final String RESIZABLE = "resizable"; //$NON-NLS-1$
+ /** Data key for column weight. */
+ protected static final String WEIGHT = "weight"; //$NON-NLS-1$
+ /** Data key for the minimum width of the column. */
+ protected static final String MIN_WIDTH = "min_width"; //$NON-NLS-1$
+ private final EMFDataBindingContext emfDatabindingContext;
+ private Optional<List<Control>> validationControls;
+
+ /**
+ * Default constructor.
+ *
+ * @param parent the parent {@link Composite}
+ * @param style the style bits
+ * @param inputObject the input object
+ * @param customization the {@link TableViewerSWTCustomization}
+ * @param title the title
+ * @param tooltip the tooltip
+ */
+ protected AbstractTableViewerComposite(
+ Composite parent,
+ int style,
+ Object inputObject,
+ TableViewerSWTCustomization customization,
+ IObservableValue title,
+ IObservableValue tooltip) {
+ super(parent, style);
+ emfDatabindingContext = new EMFDataBindingContext();
+ renderControl(this, customization, inputObject, emfDatabindingContext, title, tooltip);
+ }
+
+ /**
+ * @return the {@link AbstractTableViewer}
+ */
+ public abstract AbstractTableViewer getTableViewer();
+
+ /**
+ *
+ * @return the validation controls, if present
+ */
+ public Optional<List<Control>> getValidationControls() {
+ return validationControls;
+ }
+
+ private void renderControl(Composite parent, TableViewerSWTCustomization customization,
+ Object inputObject, EMFDataBindingContext emfDataBindingContext, IObservableValue title,
+ IObservableValue tooltip) {
+ customization.createCompositeLayout(parent);
+
+ final Optional<Label> titleLabel = customization.getTitleLabel();
+ if (titleLabel.isPresent()) {
+ initTitleLabel(titleLabel.get(), title, tooltip, emfDatabindingContext);
+ }
+
+ validationControls = customization.getValidationControls();
+
+ final Composite viewerComposite = customization.getViewerComposite();
+
+ final AbstractTableViewer tableViewer = createTableViewer(customization, viewerComposite);
+
+ final Optional<Composite> buttonComposite = customization.getButtonComposite();
+ if (buttonComposite.isPresent()) {
+ initButtonComposite(buttonComposite.get(), customization, tableViewer);
+ }
+
+ enableTooltipSupport(tableViewer);
+
+ final Optional<ViewerComparator> comparator = customization.getComparator();
+ if (comparator.isPresent()) {
+ tableViewer.setComparator(comparator.get());
+ }
+
+ tableViewer.setContentProvider(customization.createContentProvider());
+
+ addColumns(customization, tableViewer, emfDataBindingContext);
+
+ setupDragAndDrop(customization, tableViewer);
+
+ tableViewer.setInput(inputObject);
+
+ final AbstractColumnLayout layout = createLayout(viewerComposite);
+ final Widget[] columns = getColumns();
+ for (int i = 0; i < columns.length; i++) {
+ final Widget tableColumn = columns[i];
+ final boolean storedIsResizable = (Boolean) tableColumn.getData(RESIZABLE);
+ final Integer storedWeight = (Integer) tableColumn.getData(WEIGHT);
+ final Integer storedMinWidth = (Integer) tableColumn.getData(MIN_WIDTH);
+ if (storedWeight == ColumnDescription.NO_WEIGHT) {
+ layout.setColumnData(tableColumn, new ColumnPixelData(storedMinWidth, storedIsResizable));
+ } else {
+ layout.setColumnData(tableColumn,
+ new ColumnWeightData(storedWeight, storedMinWidth, storedIsResizable));
+ }
+ }
+ }
+
+ private void setupDragAndDrop(TableViewerSWTCustomization customization, final AbstractTableViewer tableViewer) {
+ if (customization.hasDND()) {
+ tableViewer.addDragSupport(customization.getDragOperations(), customization.getDragTransferTypes(),
+ customization.getDragListener(tableViewer));
+ tableViewer.addDropSupport(customization.getDropOperations(), customization.getDropTransferTypes(),
+ customization.getDropListener(tableViewer));
+ }
+ }
+
+ /**
+ * Returns the list of columns of the table viewer.
+ *
+ * @return the list of columns
+ */
+ public abstract Widget[] getColumns();
+
+ /**
+ * Sets the layout of the given {@link Composite}.
+ *
+ * @param viewerComposite the target composite
+ *
+ * @return the applied layout
+ *
+ */
+ protected abstract AbstractColumnLayout createLayout(final Composite viewerComposite);
+
+ /**
+ * Creates the table viewer.
+ *
+ * @param customization the {@link TableViewerSWTCustomization} to use
+ * @param viewerComposite the parent composite
+ *
+ * @return the table viewer
+ */
+ protected abstract AbstractTableViewer createTableViewer(TableViewerSWTCustomization customization,
+ final Composite viewerComposite);
+
+ private void addColumns(TableViewerSWTCustomization customization, AbstractTableViewer tableViewer,
+ EMFDataBindingContext emfDataBindingContext) {
+ for (final ColumnDescription columnDescription : customization.getColumns()) {
+ /* create column */
+ // TODO move TableViewerColumnBuilder?
+ createColumn(columnDescription, emfDataBindingContext, tableViewer);
+
+ }
+ }
+
+ /**
+ * Creates a new {@link ViewerColumn}.
+ *
+ * @param columnDescription the column description to use
+ * @param tableViewer the parent {@link AbstractTableViewer}
+ * @param emfDataBindingContext the data binding context to use
+ * @return the viewer column
+ */
+ protected abstract ViewerColumn createColumn(ColumnDescription columnDescription,
+ EMFDataBindingContext emfDataBindingContext, AbstractTableViewer tableViewer);
+
+ /**
+ * Creates a new {@link ColumnViewerEditorActivationStrategy} for the given table viewer.
+ *
+ * @param tableViewer the target table viewer.
+ *
+ * @return the ColumnViewerEditorActivationStrategy
+ *
+ */
+ protected static ColumnViewerEditorActivationStrategy createColumnViewerActivationStrategy(
+ final AbstractTableViewer tableViewer) {
+ return new ColumnViewerEditorActivationStrategy(tableViewer) {
+ @Override
+ protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
+ return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
+ || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION
+ || event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR
+ || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
+ }
+ };
+ }
+
+ private static void enableTooltipSupport(final AbstractTableViewer tableViewer) {
+ ColumnViewerToolTipSupport.enableFor(tableViewer);
+ }
+
+ private static void initButtonComposite(Composite composite, ButtonBarBuilder customization,
+ AbstractTableViewer viewer) {
+ customization.fillButtonComposite(composite, viewer);
+
+ }
+
+ private static void initTitleLabel(Label label, IObservableValue title, IObservableValue tooltip,
+ EMFDataBindingContext emfDatabindingContext) {
+ emfDatabindingContext.bindValue(
+ WidgetProperties.text().observe(label),
+ title);
+ emfDatabindingContext.bindValue(
+ WidgetProperties.tooltipText().observe(label),
+ tooltip);
+ }
+
+ @Override
+ public void dispose() {
+ emfDatabindingContext.dispose();
+ super.dispose();
+ }
+
+ /**
+ * Adds a new {@link ControlListener column listener}.
+ *
+ * @param columnlistener the listener to add
+ */
+ public abstract void addColumnListener(ControlListener columnlistener);
+
+ /**
+ * Returns the {@link TableControl}.
+ *
+ * @return the table control
+ */
+ public abstract TableControl getTableControl();
+
+ /**
+ * Sets the comparator of the table viewer.
+ *
+ * @param comparator the {@link TableViewerComparator} to set
+ * @param sortableColumns the list of columns that can be sorted
+ */
+ public abstract void setComparator(final TableViewerComparator comparator, List<Integer> sortableColumns);
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ButtonBarBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ButtonBarBuilder.java
index 9fc1285..0f525bf 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ButtonBarBuilder.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ButtonBarBuilder.java
@@ -11,7 +11,7 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.table;
-import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
@@ -27,9 +27,9 @@
* This method is called to fill the given {@link Composite} with all required buttons.
*
* @param composite the button bar
- * @param viewer the {@link TableViewer}
+ * @param viewer the {@link AbstractTableViewer}
*/
- void fillButtonComposite(Composite composite, TableViewer viewer);
+ void fillButtonComposite(Composite composite, AbstractTableViewer viewer);
/**
* Gets called when a button is pressed which needs to create a new element which gets added to the list.
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellEditorCreator.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellEditorCreator.java
index e9ff44f..c6e3b68 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellEditorCreator.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellEditorCreator.java
@@ -11,8 +11,8 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.table;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TableViewer;
/**
* Interface for creating a {@link CellEditor}.
@@ -23,11 +23,11 @@
public interface CellEditorCreator {
/**
- * Creates a {@link CellEditor} to be used in the given {@link TableViewer}.
- *
+ * Creates a {@link CellEditor} to be used in the given {@link AbstractTableViewer}.
+ *
* @param viewer the viewer
* @return the editor
*/
- CellEditor createCellEditor(TableViewer viewer);
+ CellEditor createCellEditor(AbstractTableViewer viewer);
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellLabelProviderFactory.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellLabelProviderFactory.java
index 325bd78..baca5c4 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellLabelProviderFactory.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/CellLabelProviderFactory.java
@@ -11,8 +11,8 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.table;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.CellLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
/**
* This factory is used to create {@link CellLabelProvider}s.
@@ -24,10 +24,10 @@
/**
* Creates the cell label provider.
- *
+ *
* @param table the table viewer
* @return the provider
*/
- CellLabelProvider createCellLabelProvider(TableViewer table);
+ CellLabelProvider createCellLabelProvider(AbstractTableViewer table);
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ColumnDescriptionImpl.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ColumnDescriptionImpl.java
index 1d1a40e..619cd17 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ColumnDescriptionImpl.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/ColumnDescriptionImpl.java
@@ -14,9 +14,9 @@
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization.ColumnDescription;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.graphics.Image;
/**
@@ -112,12 +112,12 @@
}
@Override
- public CellLabelProvider createLabelProvider(TableViewer columnViewer) {
+ public CellLabelProvider createLabelProvider(AbstractTableViewer columnViewer) {
return labelProvider.createCellLabelProvider(columnViewer);
}
@Override
- public Optional<EditingSupport> createEditingSupport(TableViewer columnViewer) {
+ public Optional<EditingSupport> createEditingSupport(AbstractTableViewer columnViewer) {
if (editingSupport.isPresent()) {
return Optional.of(editingSupport.get().createEditingSupport(columnViewer));
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DNDProvider.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DNDProvider.java
index 02aa8b9..adb8fd2 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DNDProvider.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DNDProvider.java
@@ -11,7 +11,7 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.table;
-import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.swt.dnd.DragSourceListener;
import org.eclipse.swt.dnd.DropTargetListener;
import org.eclipse.swt.dnd.Transfer;
@@ -34,7 +34,7 @@
/**
* Returns the drag operations bits used to setup the
- * {@link TableViewer#addDragSupport(int, Transfer[], DragSourceListener) drag support} for the viewer.
+ * {@link AbstractTableViewer#addDragSupport(int, Transfer[], DragSourceListener) drag support} for the viewer.
*
* @return the drag operations
*/
@@ -42,7 +42,7 @@
/**
* Returns the drag transfer types used to setup the
- * {@link TableViewer#addDragSupport(int, Transfer[], DragSourceListener) drag support} for the viewer.
+ * {@link AbstractTableViewer#addDragSupport(int, Transfer[], DragSourceListener) drag support} for the viewer.
*
* @return the drag {@link Transfer transfer types}
*/
@@ -50,16 +50,16 @@
/**
* Returns the {@link DragSourceListener} used to setup the
- * {@link TableViewer#addDragSupport(int, Transfer[], DragSourceListener) drag support} for the viewer.
+ * {@link AbstractTableViewer#addDragSupport(int, Transfer[], DragSourceListener) drag support} for the viewer.
*
- * @param tableViewer the TableViewer
+ * @param tableViewer the AbstractTableViewer
* @return the listener
*/
- DragSourceListener getDragListener(TableViewer tableViewer);
+ DragSourceListener getDragListener(AbstractTableViewer tableViewer);
/**
* Returns the drag operations bits used to setup the
- * {@link TableViewer#addDropSupport(int, Transfer[], DropTargetListener) drop support} for the viewer.
+ * {@link AbstractTableViewer#addDropSupport(int, Transfer[], DropTargetListener) drop support} for the viewer.
*
* @return the drop operations
*/
@@ -67,7 +67,7 @@
/**
* Returns the drag transfer types used to setup the
- * {@link TableViewer#addDropSupport(int, Transfer[], DropTargetListener) drop support} for the viewer.
+ * {@link AbstractTableViewer#addDropSupport(int, Transfer[], DropTargetListener) drop support} for the viewer.
*
* @return the drop {@link Transfer transfer types}
*/
@@ -75,11 +75,11 @@
/**
* Returns the {@link DragSourceListener} used to setup the
- * {@link TableViewer#addDropSupport(int, Transfer[], DropTargetListener) drop support} for the viewer.
+ * {@link AbstractTableViewer#addDropSupport(int, Transfer[], DropTargetListener) drop support} for the viewer.
*
- * @param tableViewer the TableViewer
+ * @param tableViewer the AbstractTableViewer
* @return the listener
*/
- DropTargetListener getDropListener(TableViewer tableViewer);
+ DropTargetListener getDropListener(AbstractTableViewer tableViewer);
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultButtonBarBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultButtonBarBuilder.java
index bc872e7..c25e9d6 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultButtonBarBuilder.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/DefaultButtonBarBuilder.java
@@ -19,8 +19,8 @@
import org.eclipse.emfforms.internal.swt.table.messages.MessageKeys;
import org.eclipse.emfforms.spi.localization.LocalizationServiceHelper;
import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -37,7 +37,7 @@
private NewElementCreator<Object, Button> creator;
@Override
- public void fillButtonComposite(Composite buttonComposite, TableViewer viewer) {
+ public void fillButtonComposite(Composite buttonComposite, AbstractTableViewer viewer) {
addLayoutToButtonComposite(buttonComposite);
createAddButton(buttonComposite, viewer);
createRemoveButton(buttonComposite, viewer);
@@ -67,7 +67,7 @@
* @param buttonComposite the parent
* @param viewer the viewer
*/
- protected void createRemoveButton(Composite buttonComposite, final TableViewer viewer) {
+ protected void createRemoveButton(Composite buttonComposite, final AbstractTableViewer viewer) {
final Button removeButton = new Button(buttonComposite, SWT.PUSH);
removeButton.setText(LocalizationServiceHelper.getString(DefaultButtonBarBuilder.class,
MessageKeys.DefaultButtonBarBuilder_RemoveButtonText));
@@ -104,7 +104,7 @@
* @param buttonComposite the parent
* @param viewer the viewer
*/
- protected void createAddButton(Composite buttonComposite, final TableViewer viewer) {
+ protected void createAddButton(Composite buttonComposite, final AbstractTableViewer viewer) {
final Button addButton = new Button(buttonComposite, SWT.PUSH);
addButton.setText(LocalizationServiceHelper.getString(DefaultButtonBarBuilder.class,
MessageKeys.DefaultButtonBarBuilder_AddButtonText));
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/EditingSupportCreator.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/EditingSupportCreator.java
index 3bedc18..fa2fec4 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/EditingSupportCreator.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/EditingSupportCreator.java
@@ -11,23 +11,23 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.table;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
/**
* Interface for creating the {@link EditingSupport}.
- *
+ *
* @author Johannes Faltermeier
*
*/
public interface EditingSupportCreator {
/**
- * Create the editing support which will be set on a column of the given {@link TableViewer}.
- *
+ * Create the editing support which will be set on a column of the given {@link AbstractTableViewer}.
+ *
* @param columnViewer the viewer
* @return the {@link EditingSupport}
*/
- EditingSupport createEditingSupport(TableViewer columnViewer);
+ EditingSupport createEditingSupport(AbstractTableViewer columnViewer);
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableControl.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableControl.java
new file mode 100644
index 0000000..c8cfb83
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableControl.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.table;
+
+/**
+ * @author jonas
+ *
+ */
+public interface TableControl {
+
+ /**
+ * Returns <code>true</code> if the widget has been disposed,
+ * and <code>false</code> otherwise.
+ *
+ * @return <code>true</code> when the widget is disposed and <code>false</code> otherwise
+ */
+ boolean isDisposed();
+
+ /**
+ * Returns the height of the area which would be used to
+ * display <em>one</em> of the items in the receiver.
+ *
+ * @return the height of one item
+ */
+ int getItemHeight();
+
+ /**
+ * Returns <code>true</code> if the receiver's header is visible,
+ * and <code>false</code> otherwise.
+ *
+ * @return the receiver's header's visibility state
+ */
+ boolean getHeaderVisible();
+
+ /**
+ * Returns the height of the receiver's header.
+ *
+ * @return the height of the header
+ */
+ int getHeaderHeight();
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerColumnBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerColumnBuilder.java
new file mode 100644
index 0000000..238a341
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerColumnBuilder.java
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.table;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+
+/**
+ * @author Jonas Helming
+ *
+ */
+public class TableViewerColumnBuilder {
+
+ /**
+ * Creates a new viewer column.
+ *
+ * @param tableViewer the parent table viewer
+ * @return the {@link TableViewerColumn}
+ */
+ protected TableViewerColumn buildViewerColumn(TableViewer tableViewer) {
+ return new TableViewerColumn(tableViewer, style);
+ }
+
+ /**
+ *
+ * @return creates an instance of a {@link TableViewerColumnBuilder}
+ */
+ public static TableViewerColumnBuilder create() {
+ return new TableViewerColumnBuilder();
+ }
+
+ /**
+ * Creates and customizes a {@link TableViewerColumn} for the given table viewer.
+ *
+ * @param tableViewer the target {@link TableViewerColumn}
+ * @return the {@link TableViewerColumn}
+ * @see #setText(TableViewerColumn)
+ * @see #setToolTipText(TableViewerColumn)
+ * @see #setResizable(boolean)
+ * @see #setMoveable(boolean)
+ * @see #setData(TableViewerColumn)
+ * @see #setWidth(TableViewerColumn)
+ */
+ public TableViewerColumn build(TableViewer tableViewer) {
+ final TableViewerColumn column = buildViewerColumn(tableViewer);
+ setText(column);
+ setToolTipText(column);
+ setResizable(column);
+ setMoveable(column);
+ setData(column);
+ setWidth(column);
+ return column;
+ }
+
+ private Boolean isResizable;
+ private Boolean isMoveable;
+ private String text;
+ private String tooltip;
+ private final Map<String, Object> data = new LinkedHashMap<String, Object>();
+ private Integer width;
+ private Integer style = SWT.NONE;
+
+ /**
+ * Configures the text of the {@link TableViewerColumn}.
+ *
+ * @param text the text to set
+ * @return the TableViewerColumnBuilder instance
+ */
+ public TableViewerColumnBuilder setText(String text) {
+ this.text = text;
+ return this;
+ }
+
+ /**
+ * Configures the tooltip text of the {@link TableViewerColumn}.
+ *
+ * @param tooltip the tooltip text to set
+ * @return the TableViewerColumnBuilder instance
+ */
+ public TableViewerColumnBuilder setToolTipText(String tooltip) {
+ this.tooltip = tooltip;
+ return this;
+ }
+
+ /**
+ * Configures whether the {@link TableViewerColumn} is resizable.
+ *
+ * @param isResizable the value to set
+ * @return the TableViewerColumnBuilder instance
+ */
+ public TableViewerColumnBuilder setResizable(boolean isResizable) {
+ this.isResizable = isResizable;
+ return this;
+ }
+
+ /**
+ * Configures whether the {@link TableViewerColumn} is moveable.
+ *
+ * @param isMoveable the value to set
+ * @return the TableViewerColumnBuilder instance
+ */
+ public TableViewerColumnBuilder setMoveable(boolean isMoveable) {
+ this.isMoveable = isMoveable;
+ return this;
+ }
+
+ /**
+ * Configures the application data to be set for the {@link TableViewerColumn}.
+ *
+ * @param key the data key
+ * @param value the value
+ * @return the TableViewerColumnBuilder instance
+ */
+ public TableViewerColumnBuilder setData(String key, Object value) {
+ data.put(key, value);
+ return this;
+ }
+
+ /**
+ * Configures the style of the {@link TableViewerColumn}.
+ *
+ * @param style the style bits to set
+ * @return the TableViewerColumnBuilder instance
+ */
+ public TableViewerColumnBuilder setStyle(int style) {
+ this.style = style;
+ return this;
+ }
+
+ /**
+ * Configures the width of the {@link TableViewerColumn}.
+ *
+ * @param width the width of the column
+ * @return the TableViewerColumnBuilder instance
+ */
+ public TableViewerColumnBuilder setWidth(int width) {
+ this.width = width;
+ return this;
+ }
+
+ private void setText(TableViewerColumn column) {
+ if (text != null) {
+ column.getColumn().setText(text);
+ }
+ }
+
+ private void setToolTipText(TableViewerColumn column) {
+ if (tooltip != null) {
+ column.getColumn().setToolTipText(tooltip);
+ }
+ }
+
+ private void setResizable(TableViewerColumn column) {
+ if (isResizable != null) {
+ }
+ }
+
+ private void setMoveable(TableViewerColumn column) {
+ if (isMoveable != null) {
+ column.getColumn().setMoveable(true);
+
+ }
+ }
+
+ private void setData(TableViewerColumn column) {
+ for (final Entry<String, Object> entry : data.entrySet()) {
+ column.getColumn().setData(entry.getKey(), entry.getValue());
+ }
+ }
+
+ private void setWidth(TableViewerColumn column) {
+ if (width != null) {
+ column.getColumn().setWidth(width);
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComparator.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComparator.java
new file mode 100644
index 0000000..bbe1b99
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComparator.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * jonas - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.table;
+
+/**
+ * Comparator for the table viewer.
+ *
+ * @author jonas
+ *
+ */
+public interface TableViewerComparator {
+
+ /**
+ * Sets the current column.
+ *
+ * @param i the column index
+ */
+ void setColumn(int i);
+
+ /**
+ * Returns the alignment direction.
+ *
+ * @return the alignment direction
+ * @see org.eclipse.swt.SWT#UP
+ * @see org.eclipse.swt.SWT#DOWN
+ * @see org.eclipse.swt.SWT#NONE
+ */
+ int getDirection();
+
+}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java
index 90aaeb7..d0b2c09 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java
@@ -19,24 +19,19 @@
import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization.ColumnDescription;
import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.layout.AbstractColumnLayout;
import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
-import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.EditingSupport;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TableViewerEditor;
-import org.eclipse.jface.viewers.TableViewerFocusCellManager;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
+import org.eclipse.jface.viewers.ViewerColumn;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Widget;
/**
* A {@link Composite} containing a {@link TableViewer}.
@@ -45,14 +40,9 @@
* @author Johannes Faltermeier
*
*/
-public class TableViewerComposite extends Composite {
+public class TableViewerComposite extends AbstractTableViewerComposite {
- private static final String RESIZABLE = "resizable"; //$NON-NLS-1$
- private static final String WEIGHT = "weight"; //$NON-NLS-1$
- private static final String MIN_WIDTH = "min_width"; //$NON-NLS-1$
- private final EMFDataBindingContext emfDatabindingContext;
private TableViewer tableViewer;
- private Optional<List<Control>> validationControls;
/**
* Default constructor.
@@ -64,175 +54,133 @@
* @param title the title
* @param tooltip the tooltip
*/
- TableViewerComposite(
- Composite parent,
- int style,
- Object inputObject,
+ TableViewerComposite(Composite parent, int style, Object inputObject,
TableViewerSWTCustomization customization,
- IObservableValue title,
- IObservableValue tooltip) {
- super(parent, style);
- emfDatabindingContext = new EMFDataBindingContext();
- renderControl(this, customization, inputObject, emfDatabindingContext, title, tooltip);
+ IObservableValue title, IObservableValue tooltip) {
+ super(parent, style, inputObject, customization, title, tooltip);
}
/**
* @return the {@link TableViewer}
*/
+ @Override
public TableViewer getTableViewer() {
return tableViewer;
}
/**
+ * {@inheritDoc}
*
- * @return the validation controls, if present
+ * @see org.eclipse.emfforms.spi.swt.table.AbstractTableViewerComposite#createTableViewer(org.eclipse.emfforms.spi.swt.table.TableViewerSWTCustomization,
+ * org.eclipse.swt.widgets.Composite)
*/
- public Optional<List<Control>> getValidationControls() {
- return validationControls;
- }
-
- private void renderControl(Composite parent, TableViewerSWTCustomization customization,
- Object inputObject, EMFDataBindingContext emfDataBindingContext, IObservableValue title,
- IObservableValue tooltip) {
- customization.createCompositeLayout(parent);
-
- final Optional<Label> titleLabel = customization.getTitleLabel();
- if (titleLabel.isPresent()) {
- initTitleLabel(titleLabel.get(), title, tooltip, emfDatabindingContext);
- }
-
- validationControls = customization.getValidationControls();
-
- final Composite viewerComposite = customization.getViewerComposite();
-
- tableViewer = customization.createTableViewer(viewerComposite);
-
- final Optional<Composite> buttonComposite = customization.getButtonComposite();
- if (buttonComposite.isPresent()) {
- initButtonComposite(buttonComposite.get(), customization, tableViewer);
- }
-
- enableTooltipSupport(tableViewer);
-
- enableEditingSupport(tableViewer);
-
- final Optional<ViewerComparator> comparator = customization.getComparator();
- if (comparator.isPresent()) {
- tableViewer.setComparator(comparator.get());
- }
-
- tableViewer.setContentProvider(customization.createContentProvider());
-
- addColumns(customization, tableViewer, emfDataBindingContext);
-
- tableViewer.setInput(inputObject);
-
- final TableColumnLayout layout = new TableColumnLayout();
- viewerComposite.setLayout(layout);
- for (int i = 0; i < tableViewer.getTable().getColumns().length; i++) {
- final TableColumn tableColumn = tableViewer.getTable().getColumns()[i];
- final boolean storedIsResizable = (Boolean) tableColumn.getData(RESIZABLE);
- final Integer storedWeight = (Integer) tableColumn.getData(WEIGHT);
- final Integer storedMinWidth = (Integer) tableColumn.getData(MIN_WIDTH);
- if (storedWeight == ColumnDescription.NO_WEIGHT) {
- layout.setColumnData(tableColumn, new ColumnPixelData(storedMinWidth, storedIsResizable));
- } else {
- layout.setColumnData(tableColumn,
- new ColumnWeightData(storedWeight, storedMinWidth, storedIsResizable));
- }
- }
- }
-
- private static void addColumns(TableViewerSWTCustomization customization, TableViewer tableViewer,
- EMFDataBindingContext emfDataBindingContext) {
- for (final ColumnDescription columnDescription : customization.getColumns()) {
- /* create column */
- // TODO move TableViewerColumnBuilder?
- @SuppressWarnings("restriction")
- final TableViewerColumn column = org.eclipse.emf.ecp.edit.internal.swt.controls.TableViewerColumnBuilder
- .create()
- .setData(RESIZABLE, columnDescription.isResizeable())
- .setMoveable(columnDescription.isMoveable())
- .setStyle(columnDescription.getStyleBits())
- .setData(WEIGHT, columnDescription.getWeight())
- .setData(MIN_WIDTH, columnDescription.getMinWidth())
- .build(tableViewer);
-
- /* bind text and tooltip */
- final IObservableValue text = columnDescription.getColumnText();
- emfDataBindingContext.bindValue(WidgetProperties.text().observe(column.getColumn()), text);
- final IObservableValue tooltipText = columnDescription.getColumnTooltip();
- emfDataBindingContext.bindValue(WidgetProperties.tooltipText().observe(column.getColumn()), tooltipText);
-
- /* set label provider */
- column.setLabelProvider(columnDescription.createLabelProvider(tableViewer));
-
- /* set editing support */
- final Optional<EditingSupport> editingSupport = columnDescription.createEditingSupport(tableViewer);
- if (editingSupport.isPresent()) {
- column.setEditingSupport(editingSupport.get());
- }
-
- if (columnDescription.getColumnImage().isPresent()) {
- column.getColumn().setImage(columnDescription.getColumnImage().get());
- }
-
- /* setup drag&drop */
- if (customization.hasDND()) {
- tableViewer.addDragSupport(customization.getDragOperations(), customization.getDragTransferTypes(),
- customization.getDragListener(tableViewer));
- tableViewer.addDropSupport(customization.getDropOperations(), customization.getDropTransferTypes(),
- customization.getDropListener(tableViewer));
- }
-
- }
- }
-
- private static void enableEditingSupport(final TableViewer tableViewer) {
- @SuppressWarnings("restriction")
- final TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(tableViewer,
- new org.eclipse.emf.ecp.edit.internal.swt.controls.ECPFocusCellDrawHighlighter(tableViewer));
- final ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(tableViewer) {
- @Override
- protected boolean isEditorActivationEvent(ColumnViewerEditorActivationEvent event) {
- return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
- || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_CLICK_SELECTION
- || event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR
- || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
- }
- };
- TableViewerEditor.create(
- tableViewer,
- focusCellManager,
- actSupport,
- ColumnViewerEditor.TABBING_HORIZONTAL | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
- | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
- }
-
- private static void enableTooltipSupport(final TableViewer tableViewer) {
- ColumnViewerToolTipSupport.enableFor(tableViewer);
- }
-
- private static void initButtonComposite(Composite composite, ButtonBarBuilder customization,
- TableViewer viewer) {
- customization.fillButtonComposite(composite, viewer);
-
- }
-
- private static void initTitleLabel(Label label, IObservableValue title, IObservableValue tooltip,
- EMFDataBindingContext emfDatabindingContext) {
- emfDatabindingContext.bindValue(
- WidgetProperties.text().observe(label),
- title);
- emfDatabindingContext.bindValue(
- WidgetProperties.tooltipText().observe(label),
- tooltip);
+ @Override
+ protected AbstractTableViewer createTableViewer(TableViewerSWTCustomization customization,
+ Composite viewerComposite) {
+ tableViewer = (TableViewer) customization.createTableViewer(viewerComposite);
+ return tableViewer;
}
@Override
- public void dispose() {
- emfDatabindingContext.dispose();
- super.dispose();
+ protected AbstractColumnLayout createLayout(Composite viewerComposite) {
+ final TableColumnLayout layout = new TableColumnLayout();
+ viewerComposite.setLayout(layout);
+ return layout;
+ }
+
+ @Override
+ public Widget[] getColumns() {
+ return tableViewer.getTable().getColumns();
+ }
+
+ @Override
+ public void addColumnListener(ControlListener columnlistener) {
+ for (int i = 0; i < tableViewer.getTable().getColumns().length; i++) {
+ final TableColumn tableColumn = tableViewer.getTable().getColumns()[i];
+ tableColumn.addControlListener(columnlistener);
+ }
+ }
+
+ @Override
+ public TableControl getTableControl() {
+ return new TableControl() {
+ @Override
+ public boolean isDisposed() {
+ return getTableViewer().getTable().isDisposed();
+ }
+
+ @Override
+ public int getItemHeight() {
+ return getTableViewer().getTable().getItemHeight();
+ }
+
+ @Override
+ public boolean getHeaderVisible() {
+ return getTableViewer().getTable().getHeaderVisible();
+ }
+
+ @Override
+ public int getHeaderHeight() {
+ return getTableViewer().getTable().getHeaderHeight();
+ }
+ };
+ }
+
+ @Override
+ protected ViewerColumn createColumn(ColumnDescription columnDescription,
+ EMFDataBindingContext emfDataBindingContext, AbstractTableViewer tableViewer) {
+ final TableViewerColumnBuilder builder = TableViewerColumnBuilder
+ .create();
+
+ final TableViewerColumn column = builder.setData(RESIZABLE, columnDescription.isResizeable())
+ .setMoveable(columnDescription.isMoveable())
+ .setStyle(columnDescription.getStyleBits())
+ .setData(WEIGHT, columnDescription.getWeight())
+ .setData(MIN_WIDTH, columnDescription.getMinWidth())
+ .build((TableViewer) getTableViewer());
+
+ /* bind text and tooltip */
+ final IObservableValue text = columnDescription.getColumnText();
+ emfDataBindingContext.bindValue(WidgetProperties.text().observe(column.getColumn()), text);
+ final IObservableValue tooltipText = columnDescription.getColumnTooltip();
+ emfDataBindingContext.bindValue(WidgetProperties.tooltipText().observe(column.getColumn()), tooltipText);
+
+ /* set label provider */
+ column.setLabelProvider(columnDescription.createLabelProvider(tableViewer));
+
+ /* set editing support */
+ final Optional<EditingSupport> editingSupport = columnDescription.createEditingSupport(tableViewer);
+ if (editingSupport.isPresent()) {
+ column.setEditingSupport(editingSupport.get());
+ }
+
+ if (columnDescription.getColumnImage().isPresent()) {
+ column.getColumn().setImage(columnDescription.getColumnImage().get());
+ }
+ return column;
+ }
+
+ @Override
+ public void setComparator(final TableViewerComparator comparator, List<Integer> sortableColumns) {
+ for (int i = 0; i < getTableViewer().getTable().getColumns().length; i++) {
+ if (!sortableColumns.contains(i)) {
+ continue;
+ }
+ final int j = i;
+ final TableColumn tableColumn = getTableViewer().getTable().getColumns()[i];
+ final SelectionAdapter selectionAdapter = new SelectionAdapter() {
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ comparator.setColumn(j);
+ final int dir = comparator.getDirection();
+ tableViewer.getTable().setSortDirection(dir);
+ tableViewer.getTable().setSortColumn(tableColumn);
+ tableViewer.refresh();
+ }
+ };
+ tableColumn.addSelectionListener(selectionAdapter);
+ }
+
}
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCompositeBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCompositeBuilder.java
index b588c7d..dbb94e4 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCompositeBuilder.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCompositeBuilder.java
@@ -74,7 +74,7 @@
/**
* Called after {@link #createCompositeLayout(Composite)}.
*
- * @return the parent {@link Composite} for the {@link org.eclipse.jface.viewers.TableViewer TableViewer}.
+ * @return the parent {@link Composite} for the {@link org.eclipse.jface.viewers.GridTableViewer TableViewer}.
*/
Composite getViewerComposite();
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCreator.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCreator.java
index b816e48..2a785bd 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCreator.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerCreator.java
@@ -11,23 +11,25 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.table;
-import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.swt.widgets.Composite;
/**
- * The {@link TableViewerCreator} is used to create a {@link TableViewer} on a parent composite.
+ * The {@link TableViewerCreator} is used to create a {@link AbstractTableViewer} on a parent composite.
*
- * @author Johanens Faltermeier
+ * @param <T> the type of the viewer. This must extend an {@link AbstractTableViewer}
+ *
+ * @author Johannes Faltermeier
*
*/
-public interface TableViewerCreator {
+public interface TableViewerCreator<T extends AbstractTableViewer> {
/**
- * Creates the {@link TableViewer}.
- *
+ * Creates the {@link AbstractTableViewer}.
+ *
* @param parent the parent {@link Composite}
* @return the viewer
*/
- TableViewer createTableViewer(Composite parent);
+ T createTableViewer(Composite parent);
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerFactory.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerFactory.java
index 23b2b70..42538aa 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerFactory.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerFactory.java
@@ -21,9 +21,10 @@
* @author Johannes Faltermeier
*
*/
-public final class TableViewerFactory {
+public class TableViewerFactory {
- private TableViewerFactory() {
+ /** Constructor. */
+ protected TableViewerFactory() {
// factory
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTBuilder.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTBuilder.java
index 22872c8..12ae098 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTBuilder.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTBuilder.java
@@ -31,13 +31,18 @@
* @author Johannes Faltermeier
*
*/
-public final class TableViewerSWTBuilder {
-
+public class TableViewerSWTBuilder {
+ /** The parent composite. */
private final Composite composite;
+ /** The style bits. */
private final int swtStyleBits;
+ /** The input object. */
private final Object input;
+ /** The table control customization. */
private final DefaultTableControlSWTCustomization customization;
+ /** The title. */
private final IObservableValue title;
+ /** The tooltip. */
private final IObservableValue tooltip;
/**
@@ -47,7 +52,7 @@
* @param title the title
* @param tooltip the tooltip
*/
- /* package */ TableViewerSWTBuilder(Composite composite, int swtStyleBits, Object input, IObservableValue title,
+ protected TableViewerSWTBuilder(Composite composite, int swtStyleBits, Object input, IObservableValue title,
IObservableValue tooltip) {
this.composite = composite;
this.swtStyleBits = swtStyleBits;
@@ -58,6 +63,48 @@
}
/**
+ * @return the composite
+ */
+ protected Composite getComposite() {
+ return composite;
+ }
+
+ /**
+ * @return the swtStyleBits
+ */
+ protected int getSwtStyleBits() {
+ return swtStyleBits;
+ }
+
+ /**
+ * @return the input
+ */
+ protected Object getInput() {
+ return input;
+ }
+
+ /**
+ * @return the customization
+ */
+ protected DefaultTableControlSWTCustomization getCustomization() {
+ return customization;
+ }
+
+ /**
+ * @return the title
+ */
+ protected IObservableValue getTitle() {
+ return title;
+ }
+
+ /**
+ * @return the tooltip
+ */
+ protected IObservableValue getTooltip() {
+ return tooltip;
+ }
+
+ /**
* <p>
* Use this method to customize the way title, validation, buttons and the tableviewer are arranged.
* </p>
@@ -158,6 +205,22 @@
return this;
}
+ /**
+ * <p>
+ * Use this method to customize drag&drop.
+ * </p>
+ * <p>
+ * The default behaviour disables drag&drop.
+ * </p>
+ *
+ * @param provider the provider
+ * @return self
+ */
+ public TableViewerSWTBuilder customizeDragAndDrop(DNDProvider provider) {
+ customization.setDND(provider);
+ return this;
+ }
+
// BEGIN COMPLEX CODE
/**
* Adds a column.
@@ -591,7 +654,7 @@
*
* @return the {@link TableViewerComposite}
*/
- public TableViewerComposite create() {
+ public AbstractTableViewerComposite create() {
return new TableViewerComposite(composite, swtStyleBits, input, customization, title, tooltip);
}
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTCustomization.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTCustomization.java
index cc7b1db..e5d7afb 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTCustomization.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerSWTCustomization.java
@@ -16,10 +16,10 @@
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emfforms.common.Optional;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.EditingSupport;
import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.graphics.Image;
@@ -122,15 +122,15 @@
* @param columnViewer the column viewer
* @return the label provider
*/
- CellLabelProvider createLabelProvider(TableViewer columnViewer);
+ CellLabelProvider createLabelProvider(AbstractTableViewer columnViewer);
/**
* Called to setup the {@link EditingSupport} for the viewer.
*
- * @param columnViewer the {@link TableViewer}
+ * @param columnViewer the {@link AbstractTableViewer}
* @return the editing support for the column, if present
*/
- Optional<EditingSupport> createEditingSupport(TableViewer columnViewer);
+ Optional<EditingSupport> createEditingSupport(AbstractTableViewer columnViewer);
/**
* The image of the column.
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/util/EditingSupportUtil.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/util/EditingSupportUtil.java
index 2bc4837..93326fe 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/util/EditingSupportUtil.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/util/EditingSupportUtil.java
@@ -21,8 +21,8 @@
import org.eclipse.emfforms.internal.swt.table.util.DMREditingSupport;
import org.eclipse.emfforms.spi.swt.table.CellEditorCreator;
import org.eclipse.emfforms.spi.swt.table.EditingSupportCreator;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.TableViewer;
/**
* Util class for creating {@link EditingSupport EditingSupports}.
@@ -47,7 +47,7 @@
final EObject parent, final CellEditorCreator cellEditor) {
return new EditingSupportCreator() {
@Override
- public EditingSupport createEditingSupport(TableViewer columnViewer) {
+ public EditingSupport createEditingSupport(AbstractTableViewer columnViewer) {
return new DMREditingSupport(columnViewer, cellEditor.createCellEditor(columnViewer),
domainModelReference, parent);
}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
index c07fa0c..d687862 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms TreeViewer Validation Decorator using ECP Validation Service
Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default
-Bundle-Version: 1.9.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
+Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="1.8.0"
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)"
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.9.0"
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
index e06330e..1d09450 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/DiagnosticCache.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/DiagnosticCache.java
deleted file mode 100644
index 4239ad6..0000000
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/DiagnosticCache.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Johannes Faltermeier - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;
-
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecp.common.spi.cachetree.AbstractCachedTree;
-import org.eclipse.emf.ecp.common.spi.cachetree.CachedTreeNode;
-import org.eclipse.emf.ecp.common.spi.cachetree.IExcludedObjectsCallback;
-
-/**
- * Cache for diagnostic results.
- *
- * @author Johannes Faltermeier
- *
- */
-public class DiagnosticCache extends AbstractCachedTree<Diagnostic> {
-
- /**
- * Default constructor.
- */
- public DiagnosticCache() {
- super(new IExcludedObjectsCallback() {
-
- @Override
- public boolean isExcluded(Object object) {
- return false;
- }
- });
- }
-
- @Override
- public Diagnostic getDefaultValue() {
- return Diagnostic.OK_INSTANCE;
- }
-
- @Override
- protected CachedTreeNode<Diagnostic> createdCachedTreeNode(Diagnostic value) {
- return new DiagnosticTreeNode(value);
- }
-
- /**
- * Tree node for diagnostics.
- *
- * @author Johannes Faltermeier
- *
- */
- private class DiagnosticTreeNode extends CachedTreeNode<Diagnostic> {
-
- private final Set<Diagnostic> diagnosticSet = new TreeSet<Diagnostic>(new Comparator<Diagnostic>() {
-
- @Override
- public int compare(Diagnostic o1, Diagnostic o2) {
- if (o1.getSeverity() == o2.getSeverity()) {
- if (o1 == o2) {
- return 0;
- }
- return 1;
- }
- return -1 * Integer.class.cast(o1.getSeverity()).compareTo(o2.getSeverity());
- }
-
- });
-
- DiagnosticTreeNode(Diagnostic initialValue) {
- super(initialValue);
- }
-
- @Override
- public void putIntoCache(Object key, Diagnostic value) {
- boolean updateRequired = true;
-
- if (getCache().containsKey(key)) {
- final Diagnostic diagnostic = getCache().get(key);
- if (diagnostic.getSeverity() == value.getSeverity()) {
- updateRequired = false;
- }
- diagnosticSet.remove(diagnostic);
- }
- getCache().put(key, value);
- diagnosticSet.add(value);
-
- if (updateRequired) {
- update();
- }
- }
-
- @Override
- public void update() {
- final Iterator<Diagnostic> iterator = diagnosticSet.iterator();
- if (iterator.hasNext()) {
- final Diagnostic mostSevereDiagnostic = iterator.next();
- setChildValue(mostSevereDiagnostic);
- } else {
- setChildValue(getDefaultValue());
- }
- }
-
- @Override
- public Diagnostic getDisplayValue() {
- if (getChildValue() == null) {
- return getOwnValue();
- }
- return getOwnValue().getSeverity() > getChildValue().getSeverity() ? getOwnValue() : getChildValue();
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.ecp.common.spi.cachetree.CachedTreeNode#removeFromCache(java.lang.Object)
- */
- @Override
- public void removeFromCache(Object key) {
- final Diagnostic diagnostic = getCache().remove(key);
- if (diagnostic != null) {
- diagnosticSet.remove(diagnostic);
- }
- update();
- }
- }
-
-}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java
index 390a166..7259b01 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/internal/swt/treemasterdetail/decorator/validation/ecp/ECPValidationServiceLabelDecorator.java
@@ -11,28 +11,14 @@
******************************************************************************/
package org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.Collection;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecp.edit.spi.swt.util.SWTValidationHelper;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache.ValidationListener;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.DecorationOverlayIcon;
import org.eclipse.jface.viewers.ILabelDecorator;
@@ -51,8 +37,6 @@
public class ECPValidationServiceLabelDecorator implements ILabelDecorator {
private final DiagnosticCache cache;
- private final Adapter adapter;
- private final Notifier input;
private final TreeViewer viewer;
/**
@@ -60,30 +44,26 @@
*
* @param viewer the {@link TreeViewer}
* @param input the input notifier
+ * @param cache the {@link DiagnosticCache}
*/
- public ECPValidationServiceLabelDecorator(TreeViewer viewer, Notifier input) {
+ public ECPValidationServiceLabelDecorator(TreeViewer viewer, Notifier input, DiagnosticCache cache) {
this.viewer = viewer;
- this.input = input;
- cache = new DiagnosticCache();
- adapter = new ChangeListener();
- input.eAdapters().add(adapter);
- TreeIterator<Object> allContents;
- if (ResourceSet.class.isInstance(input)) {
- allContents = EcoreUtil.getAllContents(ResourceSet.class.cast(input), false);
- } else if (Resource.class.isInstance(input)) {
- allContents = EcoreUtil.getAllContents(Resource.class.cast(input), false);
- } else if (EObject.class.isInstance(input)) {
- allContents = EcoreUtil.getAllContents(EObject.class.cast(input), false);
- } else {
- return;
- }
- while (allContents.hasNext()) {
- final Object next = allContents.next();
- if (!EObject.class.isInstance(next)) {
- continue;
+ this.cache = cache;
+ cache.registerValidationListener(new ValidationListener() {
+
+ @Override
+ public void revalidationOccurred(Collection<EObject> object, boolean potentialStructuralChange) {
+ if (potentialStructuralChange) {
+ for (final EObject o : object) {
+ refreshViewer(o);
+ }
+ } else {
+ for (final EObject o : object) {
+ updateViewer(o);
+ }
+ }
}
- updateCacheWithoutRefresh(EObject.class.cast(next), cache);
- }
+ });
viewer.refresh();
}
@@ -110,64 +90,24 @@
return icon.createImage();
}
- private static void handleRemove(EObject oldValue, DiagnosticCache cache) {
- final Set<EObject> toRemove = new LinkedHashSet<EObject>();
- toRemove.add(oldValue);
- final TreeIterator<EObject> iterator = EcoreUtil.getAllContents(oldValue, false);
- while (iterator.hasNext()) {
- toRemove.add(iterator.next());
- }
- for (final EObject object : toRemove) {
- cache.remove(object);
- }
- }
-
/**
* Called in order to update the cache. This also triggers a viewer refresh.
- *
+ *
* @param element The element which changed
- * @param cache The cache to update
*/
- protected void updateCache(EObject element, DiagnosticCache cache) {
- final Diagnostic diagnostic = getDiagnostic(element);
- final Set<EObject> update = cache.update(element, diagnostic);
- for (final EObject eObject : update) {
- viewer.refresh(eObject, true);
- }
+ protected void refreshViewer(EObject element) {
+ viewer.refresh(element, true);
}
/**
* Called in order to update the cache. This also triggers a viewer update.
- *
+ *
* @param element The element which changed
- * @param cache The cache to update
*/
- protected void updateCacheWithoutRefresh(EObject element, DiagnosticCache cache) {
- final Diagnostic diagnostic = getDiagnostic(element);
- final Set<EObject> update = cache.update(element, diagnostic);
- viewer.update(update.toArray(), null);
+ protected void updateViewer(EObject element) {
viewer.update(element, null);
}
- private static Diagnostic getDiagnostic(Object object) {
- if (!EObject.class.isInstance(object)) {
- return Diagnostic.OK_INSTANCE;
- }
- final EObject eObject = EObject.class.cast(object);
- EValidator validator = EValidator.Registry.INSTANCE.getEValidator(eObject.eClass().getEPackage());
- final BasicDiagnostic diagnostics = Diagnostician.INSTANCE.createDefaultDiagnostic(eObject);
-
- if (validator == null) {
- validator = new EObjectValidator();
- }
- final Map<Object, Object> context = new HashMap<Object, Object>();
- context.put(EValidator.SubstitutionLabelProvider.class, Diagnostician.INSTANCE);
- context.put(EValidator.class, validator);
-
- validator.validate(eObject, diagnostics, context);
- return diagnostics;
- }
-
@Override
public String decorateText(String text, Object element) {
/* no op */
@@ -192,101 +132,7 @@
@Override
public void dispose() {
- input.eAdapters().remove(adapter);
- }
-
- /**
- *
- * An adapter which will update the cache.
- *
- * @author Johannes Faltermeier
- *
- */
- private final class ChangeListener extends EContentAdapter {
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- if (notification.isTouch()) {
- return;
- }
- handleStructuralChangeNotification(notification);
- if (!EObject.class.isInstance(notification.getNotifier())) {
- return;
- }
- updateCacheWithoutRefresh(EObject.class.cast(notification.getNotifier()), cache);
- }
-
- private void handleStructuralChangeNotification(Notification notification) {
- switch (notification.getEventType()) {
- case Notification.REMOVE: {
- handleSingleRemove(notification);
- break;
- }
- case Notification.REMOVE_MANY: {
- @SuppressWarnings("unchecked")
- final List<Object> deleted = (List<Object>) notification.getOldValue();
- if (deleted.isEmpty() || !EObject.class.isInstance(deleted.get(0))) {
- break;
- }
- for (final Object oldValue : deleted) {
- handleRemove(EObject.class.cast(oldValue), cache);
- }
- break;
- }
- case Notification.ADD: {
- handleAdd(notification);
- break;
- }
- case Notification.ADD_MANY: {
- @SuppressWarnings("unchecked")
- final List<Object> added = (List<Object>) notification.getNewValue();
- if (added.isEmpty() || !EObject.class.isInstance(added.get(0))) {
- break;
- }
- for (final Object newValue : added) {
- final TreeIterator<EObject> iterator = EcoreUtil.getAllContents(EObject.class.cast(newValue),
- false);
- while (iterator.hasNext()) {
- updateCacheWithoutRefresh(iterator.next(), cache);
- }
- updateCache(EObject.class.cast(newValue), cache);
- }
- break;
-
- }
- case Notification.SET: {
- if (!EReference.class.isInstance(notification.getFeature())
- || !EReference.class.cast(notification.getFeature()).isContainment()) {
- break;
- }
- handleAdd(notification);
-
- break;
- }
- default:
- break;
- }
- }
-
- private void handleSingleRemove(Notification notification) {
- final Object oldValue = notification.getOldValue();
- if (!EObject.class.isInstance(oldValue)) {
- return;
- }
- handleRemove(EObject.class.cast(oldValue), cache);
- }
-
- private void handleAdd(Notification notification) {
- final Object newValue = notification.getNewValue();
- if (!EObject.class.isInstance(newValue)) {
- return;
- }
- final TreeIterator<EObject> iterator = EcoreUtil.getAllContents(EObject.class.cast(newValue), false);
- while (iterator.hasNext()) {
- updateCacheWithoutRefresh(iterator.next(), cache);
- }
- updateCache(EObject.class.cast(newValue), cache);
- }
+ cache.dispose();
}
}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/spi/swt/treemasterdetail/decorator/validation/ecp/ECPValidationLabelDecoratorProvider.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/spi/swt/treemasterdetail/decorator/validation/ecp/ECPValidationLabelDecoratorProvider.java
index 0d8296e..e41623b 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/spi/swt/treemasterdetail/decorator/validation/ecp/ECPValidationLabelDecoratorProvider.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/src/org/eclipse/emfforms/spi/swt/treemasterdetail/decorator/validation/ecp/ECPValidationLabelDecoratorProvider.java
@@ -15,6 +15,7 @@
import org.eclipse.emfforms.common.Optional;
import org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp.ECPValidationServiceLabelDecorator;
import org.eclipse.emfforms.spi.swt.treemasterdetail.LabelDecoratorProvider;
+import org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic.DiagnosticCache;
import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.TreeViewer;
@@ -26,6 +27,7 @@
private final Notifier input;
private ECPValidationServiceLabelDecorator decorator;
+ private final DiagnosticCache cache;
/**
* Default constructor.
@@ -33,12 +35,23 @@
* @param input the notifier which we will display the diagnostics
*/
public ECPValidationLabelDecoratorProvider(Notifier input) {
+ this(input, new DiagnosticCache(input));
+ }
+
+ /**
+ * Default constructor.
+ *
+ * @param input the notifier which we will display the diagnostics
+ * @param cache the cache to use.
+ */
+ public ECPValidationLabelDecoratorProvider(Notifier input, DiagnosticCache cache) {
this.input = input;
+ this.cache = cache;
}
@Override
public Optional<ILabelDecorator> getLabelDecorator(TreeViewer viewer) {
- decorator = new ECPValidationServiceLabelDecorator(viewer, input);
+ decorator = new ECPValidationServiceLabelDecorator(viewer, input, cache);
return Optional.<ILabelDecorator> of(decorator);
}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/.settings/.api_filters b/bundles/org.eclipse.emfforms.swt.treemasterdetail/.settings/.api_filters
index e03463c..ddcd569 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/.settings/.api_filters
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/.settings/.api_filters
@@ -79,6 +79,49 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/MasterDetailAction.java">
+ <filter id="0"/>
+ </resource>
+ <resource path="src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/MasterDetailAction.java" type="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction">
+ <filter comment="SPI Change 1.10.0" id="336695337">
+ <message_arguments>
+ <message_argument value="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction"/>
+ <message_argument value="execute(List<Object>)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="336695337">
+ <message_arguments>
+ <message_argument value="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction"/>
+ <message_argument value="shouldShow(List<Object>)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction"/>
+ <message_argument value="execute(EObject)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.MasterDetailAction"/>
+ <message_argument value="shouldShow(EObject)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/DelegatingMasterDetailAction.java" type="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating.DelegatingMasterDetailAction">
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating.DelegatingMasterDetailAction"/>
+ <message_argument value="execute(EObject)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Change 1.10.0" id="338792546">
+ <message_arguments>
+ <message_argument value="org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating.DelegatingMasterDetailAction"/>
+ <message_argument value="shouldShow(EObject)"/>
+ </message_arguments>
+ </filter>
+ </resource>
<resource path="src/org/eclipse/emfforms/spi/swt/treemasterdetail/util/CreateChildAction.java" type="org.eclipse.emfforms.spi.swt.treemasterdetail.util.CreateChildAction">
<filter comment="This is SPI" id="576720909">
<message_arguments>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
index 26bb369..e2208f5 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
@@ -2,28 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: Treemasterdetail SWT Util
Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.9.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.9.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
- org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.9.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.9.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.9.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.9.0"
+Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.10.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.10.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
+ org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.10.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.10.0"
Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.equinox.registry;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
index 1cd2fce..532f7be 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.treemasterdetail</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
index 16eb7e3..17c1a90 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailComposite.java
@@ -93,6 +93,8 @@
private ECPSWTView renderedView;
private final Shell limbo;
+ private Object lastRenderedObject;
+
private final TreeMasterDetailSWTCustomization customization;
private TreeMasterDetailCache cache = new TreeMasterDetailCache() {
@@ -171,6 +173,9 @@
@Override
public void selectionChanged(SelectionChangedEvent event) {
+ if (lastRenderedObject == getCurrentSelection()) {
+ return;
+ }
updateDetailPanel();
}
});
@@ -237,8 +242,9 @@
.getSelection()).getFirstElement() : null;
if (selectedObject instanceof EObject) {
+ lastRenderedObject = selectedObject;
final EObject eObject = EObject.class.cast(selectedObject);
- if (renderedView != null) {
+ if (renderedView != null && !renderedView.getSWTControl().isDisposed()) {
renderedView.getSWTControl().setParent(limbo);
cache.cache(renderedView);
}
@@ -279,34 +285,39 @@
}
}
} else {
- if (renderedView != null) {
- renderedView.getSWTControl().setParent(limbo);
- cache.cache(renderedView);
- /* set renderedView to null so that it is not offered to the cache further times */
- renderedView = null;
- }
- createDetailPanel();
- final Label hint = new Label(detailPanel, SWT.CENTER);
- final FontDescriptor boldDescriptor = FontDescriptor.createFrom(hint.getFont()).setHeight(18)
- .setStyle(SWT.BOLD);
- final Font boldFont = boldDescriptor.createFont(hint.getDisplay());
- hint.setFont(boldFont);
- hint.setForeground(new Color(hint.getDisplay(), 190, 190, 190));
- hint.setText("Select a node in the tree to edit it");
- final GridData hintLayoutData = new GridData();
- hintLayoutData.grabExcessVerticalSpace = true;
- hintLayoutData.grabExcessHorizontalSpace = true;
- hintLayoutData.horizontalAlignment = SWT.CENTER;
- hintLayoutData.verticalAlignment = SWT.CENTER;
- hint.setLayoutData(hintLayoutData);
+ renderEmptyDetailPanel();
+ }
+ }
- detailPanel.pack();
- detailPanel.layout(true, true);
+ private void renderEmptyDetailPanel() {
+ lastRenderedObject = null;
+ if (renderedView != null && !renderedView.getSWTControl().isDisposed()) {
+ renderedView.getSWTControl().setParent(limbo);
+ cache.cache(renderedView);
+ /* set renderedView to null so that it is not offered to the cache further times */
+ renderedView = null;
+ }
+ createDetailPanel();
+ final Label hint = new Label(detailPanel, SWT.CENTER);
+ final FontDescriptor boldDescriptor = FontDescriptor.createFrom(hint.getFont()).setHeight(18)
+ .setStyle(SWT.BOLD);
+ final Font boldFont = boldDescriptor.createFont(hint.getDisplay());
+ hint.setFont(boldFont);
+ hint.setForeground(new Color(hint.getDisplay(), 190, 190, 190));
+ hint.setText("Select a node in the tree to edit it");
+ final GridData hintLayoutData = new GridData();
+ hintLayoutData.grabExcessVerticalSpace = true;
+ hintLayoutData.grabExcessHorizontalSpace = true;
+ hintLayoutData.horizontalAlignment = SWT.CENTER;
+ hintLayoutData.verticalAlignment = SWT.CENTER;
+ hint.setLayoutData(hintLayoutData);
- if (ScrolledComposite.class.isInstance(detailComposite)) {
- ScrolledComposite.class.cast(detailComposite)
- .setMinSize(detailPanel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- }
+ detailPanel.pack();
+ detailPanel.layout(true, true);
+
+ if (ScrolledComposite.class.isInstance(detailComposite)) {
+ ScrolledComposite.class.cast(detailComposite)
+ .setMinSize(detailPanel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
}
}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailMenuListener.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailMenuListener.java
index ff90560..1a35365 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailMenuListener.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/TreeMasterDetailMenuListener.java
@@ -12,6 +12,7 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.treemasterdetail;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -113,17 +114,19 @@
manager.add(new Separator());
addDeleteActionToContextMenu(editingDomain, menuMgr, selection);
- if (selection.getFirstElement() instanceof EObject && rightClickActions != null) {
- final EObject eSelectedObject = (EObject) selection.getFirstElement();
+ if (rightClickActions != null) {
+ // JFACE API
+ @SuppressWarnings("unchecked")
+ final List<Object> list = new ArrayList<Object>(selection.toList());
for (final MasterDetailAction menuAction : rightClickActions) {
- if (menuAction.shouldShow(eSelectedObject)) {
+ if (menuAction.shouldShow(list)) {
menuAction.setTreeViewer(treeViewer);
final Action newAction = new Action() {
@Override
public void run() {
super.run();
- menuAction.execute(eSelectedObject);
+ menuAction.execute(list);
}
};
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/MasterDetailAction.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/MasterDetailAction.java
index 627876e..9ddca78 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/MasterDetailAction.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/MasterDetailAction.java
@@ -8,15 +8,21 @@
*
* Contributors:
* Alexandra Buzila - initial API and implementation
+ * Johannes Faltermeier - Bug 500895
******************************************************************************/
package org.eclipse.emfforms.spi.swt.treemasterdetail.actions;
+import java.util.List;
+
import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.viewers.TreeViewer;
/**
+ * A MasterDetailAction may be added to the context menu of a
+ * {@link org.eclipse.emfforms.spi.swt.treemasterdetail.TreeMasterDetailComposite TreeMasterDetailComposite}.
+ *
* @author Alexandra Buzila
+ * @author Johannes Faltermeier
* @since 1.8
*
*/
@@ -25,15 +31,17 @@
private TreeViewer treeviewer;
/**
- * @param eObject the {@link EObject} on which to test if the action can be executed
- * @return <b>true</b> if the action can be executed on the parameter {@code eObject}
+ * @param objects the list of objects on which to test if the action can be executed
+ * @return <b>true</b> if the action can be executed on the parameter
+ * @since 1.10
*/
- public abstract boolean shouldShow(EObject eObject);
+ public abstract boolean shouldShow(List<Object> objects);
/**
- * @param object The {@link EObject} on which the action is executed
+ * @param objects The list of objects on which the action is executed
+ * @since 1.10
**/
- public abstract void execute(EObject object);
+ public abstract void execute(List<Object> objects);
/**
* @return the label of the action
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/DelegatingMasterDetailAction.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/DelegatingMasterDetailAction.java
index c2e6509..40f1111 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/DelegatingMasterDetailAction.java
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/actions/delegating/DelegatingMasterDetailAction.java
@@ -11,9 +11,10 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;
+import java.util.List;
+
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emfforms.spi.swt.treemasterdetail.actions.KeybindedMasterDetailAction;
import org.eclipse.jface.viewers.ISelection;
@@ -85,8 +86,8 @@
}
@Override
- public void execute(EObject object) {
- final IStructuredSelection selection = new StructuredSelection(object);
+ public void execute(List<Object> objects) {
+ final IStructuredSelection selection = new StructuredSelection(objects);
delegatedAction.selectionChanged(selection);
if (delegatedAction.isEnabled()) {
delegatedAction.run();
@@ -94,8 +95,8 @@
}
@Override
- public boolean shouldShow(EObject eObject) {
- final IStructuredSelection selection = new StructuredSelection(eObject);
+ public boolean shouldShow(List<Object> objects) {
+ final IStructuredSelection selection = new StructuredSelection(objects);
delegatedAction.selectionChanged(selection);
return delegatedAction.isEnabled();
}
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/diagnostic/DiagnosticCache.java b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/diagnostic/DiagnosticCache.java
new file mode 100644
index 0000000..2f07b62
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/src/org/eclipse/emfforms/spi/swt/treemasterdetail/diagnostic/DiagnosticCache.java
@@ -0,0 +1,429 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EValidator;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.Diagnostician;
+import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.ecore.util.EObjectValidator;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecp.common.spi.cachetree.AbstractCachedTree;
+import org.eclipse.emf.ecp.common.spi.cachetree.CachedTreeNode;
+import org.eclipse.emf.ecp.common.spi.cachetree.IExcludedObjectsCallback;
+
+/**
+ * Cache for diagnostic results.
+ *
+ * @author Johannes Faltermeier
+ * @since 1.10
+ *
+ */
+public class DiagnosticCache extends AbstractCachedTree<Diagnostic> {
+
+ private final Set<ValidationListener> validationListeners = new CopyOnWriteArraySet<ValidationListener>();
+
+ private ValidationChangeListener validationChangeListener;
+
+ private Notifier input;
+
+ /**
+ * Default constructor.
+ *
+ * @param input the input
+ */
+ public DiagnosticCache(Notifier input) {
+ super(new IExcludedObjectsCallback() {
+
+ @Override
+ public boolean isExcluded(Object object) {
+ return false;
+ }
+ });
+ init(input);
+ }
+
+ private void init(Notifier input) {
+ this.input = input;
+ validationChangeListener = new ValidationChangeListener(input);
+ TreeIterator<Object> allContents;
+ if (ResourceSet.class.isInstance(input)) {
+ allContents = EcoreUtil.getAllContents(ResourceSet.class.cast(input), false);
+ } else if (Resource.class.isInstance(input)) {
+ allContents = EcoreUtil.getAllContents(Resource.class.cast(input), false);
+ } else if (EObject.class.isInstance(input)) {
+ allContents = EcoreUtil.getAllContents(EObject.class.cast(input), false);
+ } else {
+ return;
+ }
+ while (allContents.hasNext()) {
+ final Object next = allContents.next();
+ if (!EObject.class.isInstance(next)) {
+ continue;
+ }
+ updateCacheWithoutRefresh(EObject.class.cast(next), this);
+ }
+ }
+
+ @Override
+ public Diagnostic getDefaultValue() {
+ return Diagnostic.OK_INSTANCE;
+ }
+
+ @Override
+ protected CachedTreeNode<Diagnostic> createdCachedTreeNode(Diagnostic value) {
+ return new DiagnosticTreeNode(value);
+ }
+
+ /**
+ * @return the objects with cached values.
+ */
+ public Set<Object> getObjects() {
+ return Collections.unmodifiableSet(new LinkedHashSet<Object>(getNodes().keySet()));
+ }
+
+ /**
+ * @param o the object
+ * @return the objects diagnostic
+ */
+ public Diagnostic getOwnValue(Object o) {
+ if (o == null) {
+ return getDefaultValue();
+ }
+ final CachedTreeNode<Diagnostic> treeNode = getNodes().get(o);
+ if (treeNode == null) {
+ /* there is no entry in the cache */
+ return getDefaultValue();
+ }
+ return treeNode.getOwnValue();
+ }
+
+ /**
+ * Disposes this cache.
+ */
+ public void dispose() {
+ validationChangeListener.dispose();
+ }
+
+ /**
+ * Does a reinit of this cache <b>if</b> the given notifier is different than the current one.
+ *
+ * @param notifier the notifier
+ */
+ public void reinit(Notifier notifier) {
+ if (input == notifier) {
+ return;
+ }
+ dispose();
+ clear();
+ init(notifier);
+ }
+
+ /**
+ * @param listener the {@link ValidationListener} to register
+ */
+ public void registerValidationListener(ValidationListener listener) {
+ validationListeners.add(listener);
+ }
+
+ /**
+ *
+ * @param listener the {@link ValidationListener} to deregister
+ */
+ public void deregisterValidationListener(ValidationListener listener) {
+ validationListeners.remove(listener);
+ }
+
+ /**
+ * UPdates the cache and notifies listeners that this was a potential structure change.
+ *
+ * @param element the changed element
+ * @param cache the cache
+ */
+ protected void updateCache(EObject element, DiagnosticCache cache) {
+ final Diagnostic diagnostic = getDiagnostic(element);
+ final Set<EObject> update = cache.update(element, diagnostic);
+ notifyValidationListeners(update, true);
+
+ }
+
+ private void handleRemove(EObject oldValue, DiagnosticCache cache) {
+ final Set<EObject> toRemove = new LinkedHashSet<EObject>();
+ toRemove.add(oldValue);
+ final TreeIterator<EObject> iterator = EcoreUtil.getAllContents(oldValue, false);
+ while (iterator.hasNext()) {
+ toRemove.add(iterator.next());
+ }
+ for (final EObject object : toRemove) {
+ cache.remove(object);
+ }
+ }
+
+ private static Diagnostic getDiagnostic(Object object) {
+ if (!EObject.class.isInstance(object)) {
+ return Diagnostic.OK_INSTANCE;
+ }
+ final EObject eObject = EObject.class.cast(object);
+ EValidator validator = EValidator.Registry.INSTANCE.getEValidator(eObject.eClass().getEPackage());
+ final BasicDiagnostic diagnostics = Diagnostician.INSTANCE.createDefaultDiagnostic(eObject);
+
+ if (validator == null) {
+ validator = new EObjectValidator();
+ }
+ final Map<Object, Object> context = new HashMap<Object, Object>();
+ context.put(EValidator.SubstitutionLabelProvider.class, Diagnostician.INSTANCE);
+ context.put(EValidator.class, validator);
+
+ validator.validate(eObject, diagnostics, context);
+ return diagnostics;
+ }
+
+ private void notifyValidationListeners(final Set<EObject> update, boolean struc) {
+ for (final ValidationListener validationListener : validationListeners) {
+ validationListener.revalidationOccurred(update, struc);
+ }
+ }
+
+ /**
+ * Updates the cache and notifes listeners that this change was not a structure change.
+ *
+ * @param element the element
+ * @param cache the cache
+ */
+ protected void updateCacheWithoutRefresh(EObject element, DiagnosticCache cache) {
+ final Diagnostic diagnostic = getDiagnostic(element);
+ final Set<EObject> update = cache.update(element, diagnostic);
+ notifyValidationListeners(update, false);
+ notifyValidationListeners(Collections.singleton(element), false);
+ }
+
+ /**
+ * Tree node for diagnostics.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+ private class DiagnosticTreeNode extends CachedTreeNode<Diagnostic> {
+
+ private final Set<Diagnostic> diagnosticSet = new TreeSet<Diagnostic>(new Comparator<Diagnostic>() {
+
+ @Override
+ public int compare(Diagnostic o1, Diagnostic o2) {
+ if (o1.getSeverity() == o2.getSeverity()) {
+ if (o1 == o2) {
+ return 0;
+ }
+ return 1;
+ }
+ return -1 * Integer.class.cast(o1.getSeverity()).compareTo(o2.getSeverity());
+ }
+
+ });
+
+ DiagnosticTreeNode(Diagnostic initialValue) {
+ super(initialValue);
+ }
+
+ @Override
+ public void putIntoCache(Object key, Diagnostic value) {
+ boolean updateRequired = true;
+
+ if (getCache().containsKey(key)) {
+ final Diagnostic diagnostic = getCache().get(key);
+ if (diagnostic.getSeverity() == value.getSeverity()) {
+ updateRequired = false;
+ }
+ diagnosticSet.remove(diagnostic);
+ }
+ getCache().put(key, value);
+ diagnosticSet.add(value);
+
+ if (updateRequired) {
+ update();
+ }
+ }
+
+ @Override
+ public void update() {
+ final Iterator<Diagnostic> iterator = diagnosticSet.iterator();
+ if (iterator.hasNext()) {
+ final Diagnostic mostSevereDiagnostic = iterator.next();
+ setChildValue(mostSevereDiagnostic);
+ } else {
+ setChildValue(getDefaultValue());
+ }
+ }
+
+ @Override
+ public Diagnostic getDisplayValue() {
+ if (getChildValue() == null) {
+ return getOwnValue();
+ }
+ return getOwnValue().getSeverity() > getChildValue().getSeverity() ? getOwnValue() : getChildValue();
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.common.spi.cachetree.CachedTreeNode#removeFromCache(java.lang.Object)
+ */
+ @Override
+ public void removeFromCache(Object key) {
+ final Diagnostic diagnostic = getCache().remove(key);
+ if (diagnostic != null) {
+ diagnosticSet.remove(diagnostic);
+ }
+ update();
+ }
+ }
+
+ /**
+ *
+ * An adapter which will update the cache.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+ private final class ValidationChangeListener extends EContentAdapter {
+
+ private final Notifier parent;
+
+ ValidationChangeListener(Notifier parent) {
+ this.parent = parent;
+ parent.eAdapters().add(this);
+ }
+
+ @Override
+ public void notifyChanged(Notification notification) {
+ super.notifyChanged(notification);
+ if (notification.isTouch()) {
+ return;
+ }
+ handleStructuralChangeNotification(notification);
+ if (!EObject.class.isInstance(notification.getNotifier())) {
+ return;
+ }
+ updateCacheWithoutRefresh(EObject.class.cast(notification.getNotifier()), DiagnosticCache.this);
+ }
+
+ void dispose() {
+ parent.eAdapters().remove(this);
+ }
+
+ private void handleStructuralChangeNotification(Notification notification) {
+ switch (notification.getEventType()) {
+ case Notification.REMOVE: {
+ handleSingleRemove(notification);
+ break;
+ }
+ case Notification.REMOVE_MANY: {
+ @SuppressWarnings("unchecked")
+ final List<Object> deleted = (List<Object>) notification.getOldValue();
+ if (deleted.isEmpty() || !EObject.class.isInstance(deleted.get(0))) {
+ break;
+ }
+ for (final Object oldValue : deleted) {
+ handleRemove(EObject.class.cast(oldValue), DiagnosticCache.this);
+ }
+ break;
+ }
+ case Notification.ADD: {
+ handleAdd(notification);
+ break;
+ }
+ case Notification.ADD_MANY: {
+ @SuppressWarnings("unchecked")
+ final List<Object> added = (List<Object>) notification.getNewValue();
+ if (added.isEmpty() || !EObject.class.isInstance(added.get(0))) {
+ break;
+ }
+ for (final Object newValue : added) {
+ final TreeIterator<EObject> iterator = EcoreUtil.getAllContents(EObject.class.cast(newValue),
+ false);
+ while (iterator.hasNext()) {
+ updateCacheWithoutRefresh(iterator.next(), DiagnosticCache.this);
+ }
+ updateCache(EObject.class.cast(newValue), DiagnosticCache.this);
+ }
+ break;
+
+ }
+ case Notification.SET: {
+ if (!EReference.class.isInstance(notification.getFeature())
+ || !EReference.class.cast(notification.getFeature()).isContainment()) {
+ break;
+ }
+ handleAdd(notification);
+
+ break;
+ }
+ default:
+ break;
+ }
+ }
+
+ private void handleSingleRemove(Notification notification) {
+ final Object oldValue = notification.getOldValue();
+ if (!EObject.class.isInstance(oldValue)) {
+ return;
+ }
+ handleRemove(EObject.class.cast(oldValue), DiagnosticCache.this);
+ }
+
+ private void handleAdd(Notification notification) {
+ final Object newValue = notification.getNewValue();
+ if (!EObject.class.isInstance(newValue)) {
+ return;
+ }
+ final TreeIterator<EObject> iterator = EcoreUtil.getAllContents(EObject.class.cast(newValue), false);
+ while (iterator.hasNext()) {
+ updateCacheWithoutRefresh(iterator.next(), DiagnosticCache.this);
+ }
+ updateCache(EObject.class.cast(newValue), DiagnosticCache.this);
+ }
+ }
+
+ /**
+ * Notified when the validation changes.
+ *
+ */
+ public interface ValidationListener {
+ /**
+ * Called when a revalidation for the object has happened.
+ *
+ * @param object the object
+ * @param potentialStructuralChange whether this was caused by a structural change.
+ */
+ void revalidationOccurred(Collection<EObject> object, boolean potentialStructuralChange);
+ }
+
+}
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
index dc874bf..199c4c4 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.annotation.model.edit/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.emfforms.spi.view.annotation.model.provider.AnnotationEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
index a66f0f6..e5e4523 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.annotation.model.edit/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
index 7cc9a30..f3cc311 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.annotation.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.annotation.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.9.0",
- org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.9.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.10.0",
+ org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.10.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml b/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
index 7b097a7..03ed60c 100644
--- a/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.annotation.model/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
index d9c27c2..241b7ad 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider.ControlgridEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.9.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.10.0,2.0.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
+Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.10.0,2.0.0)";resolution:=optional,
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.10.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.9.0,2.0.0)";resolution:=optional,
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.9.0,2.0.0)";resolution:=optional
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
index 820e4bf..1a4158b 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
index 61551b1..e78f85b 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.view.controlgrid.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.9.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.9.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.10.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.10.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.10.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.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
index b8fc782..c67c468 100644
--- a/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.controlgrid.model/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
index 8aad6a9..045ce9c 100644
--- a/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.view.model.localization/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms View Localization
Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.10.0,2.0.0)",
org.osgi.framework;version="1.5.0"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.view.model.localization/pom.xml b/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
index 6bf23a7..e25c2d2 100644
--- a/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
+++ b/bundles/org.eclipse.emfforms.view.model.localization/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
index 278d213..5934f4e 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model.edit/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@
Bundle-Localization: plugin
Export-Package: org.eclipse.emfforms.spi.spreadsheet.core.error.model.provider;version="1.0.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,1.1.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
index 1ef720d..80ac708 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/META-INF/MANIFEST.MF
@@ -11,12 +11,12 @@
org.eclipse.emfforms.spi.spreadsheet.core.error.model.util;version="1.0.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.databinding.observable.list;version="0.0.0",
org.eclipse.core.databinding.observable.value;version="0.0.0",
org.eclipse.core.databinding.property.list;version="0.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
- org.eclipse.emfforms.internal.core.services.label;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.internal.core.services.label;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.10.0,2.0.0)"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore
index 7d9dc83..3bb205d 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.error.model/model/error.ecore
@@ -6,7 +6,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="errorReports" upperBound="-1"
eType="#//ErrorReport" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="importedEObjects" upperBound="-1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="settingToSheetMap" upperBound="-1"
eType="#//SettingToSheetMapping"/>
</eClassifiers>
@@ -38,7 +38,7 @@
defaultValueLiteral="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EMFLocation">
- <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="root" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="settingLocation" eType="#//SettingLocation"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="dmrLocation" eType="#//DMRLocation"
@@ -46,9 +46,9 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="SettingLocation">
<eStructuralFeatures xsi:type="ecore:EReference" name="eObject" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DMRLocation">
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelReference" lowerBound="1"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
index 5aa16e0..a63f0ad 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/META-INF/MANIFEST.MF
@@ -5,12 +5,12 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.view.annotation.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.6.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationElementRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategorizationRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization.EMFFormsCategoryRendererService.xml
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationElementRendererService.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationElementRendererService.java
index 867b4fd..1d2c129 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationElementRendererService.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationElementRendererService.java
@@ -43,7 +43,7 @@
*
* @param reportService the reportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -92,7 +92,8 @@
* @see org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService#getRendererInstance(VElement,ViewModelContext)
*/
@Override
- public EMFFormsAbstractSpreadsheetRenderer<VCategorizationElement> getRendererInstance(VCategorizationElement vElement,
+ public EMFFormsAbstractSpreadsheetRenderer<VCategorizationElement> getRendererInstance(
+ VCategorizationElement vElement,
ViewModelContext viewModelContext) {
return new EMFFormsCategorizationElementRenderer(emfformsSpreadsheetRendererFactory, reportService);
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationRendererService.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationRendererService.java
index 8ca1045..db600bf 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationRendererService.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategorizationRendererService.java
@@ -42,7 +42,7 @@
*
* @param reportService the reportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategoryRendererService.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategoryRendererService.java
index 55072e2..ea7dc8b 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategoryRendererService.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/categorization/EMFFormsCategoryRendererService.java
@@ -41,7 +41,7 @@
*
* @param reportService the reportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
index cb651d9..2ce5898 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.custom/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.custom;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
index 1cbb227..d59fc1e 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/META-INF/MANIFEST.MF
@@ -5,17 +5,17 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.table;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core.renderer;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
org.osgi.framework;version="1.8.0",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)"
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml
index 2fa6c3e..78d9be1 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/table/EMFFormsSpreadsheetTableControlRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService" activate="activate" deactivate="deactivate" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <service>
- <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
- </service>
- <reference name="VTViewTemplateProvider" interface="org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider" bind="setVTViewTemplateProvider"/>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
- <reference name="EmfformsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" bind="setEmfformsDatabinding"/>
- <reference name="EmfformsLabelProvider" interface="org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider" bind="setEmfformsLabelProvider"/>
- <reference name="EmfFormsIdProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsIdProvider" bind="setEmfFormsIdProvider"/>
- <reference name="ConverterRegistry" interface="org.eclipse.emfforms.spi.spreadsheet.core.converter.EMFFormsSpreadsheetValueConverterRegistry" bind="setConverterRegistry"/>
- <reference name="FormatDescriptionProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetFormatDescriptionProvider" bind="setFormatDescriptionProvider"/>
- <reference name="EMFFormsDomainExpander" interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDomainExpander" bind="setEMFFormsDomainExpander"/>
- <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" deactivate="deactivate" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+ </service>
+ <reference bind="setConverterRegistry" interface="org.eclipse.emfforms.spi.spreadsheet.core.converter.EMFFormsSpreadsheetValueConverterRegistry" name="ConverterRegistry"/>
+ <reference bind="setEMFFormsDomainExpander" interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDomainExpander" name="EMFFormsDomainExpander"/>
+ <reference bind="setEmfFormsIdProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsIdProvider" name="EmfFormsIdProvider"/>
+ <reference bind="setEmfformsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" name="EmfformsDatabinding"/>
+ <reference bind="setEmfformsLabelProvider" interface="org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider" name="EmfformsLabelProvider"/>
+ <reference bind="setFormatDescriptionProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetFormatDescriptionProvider" name="FormatDescriptionProvider"/>
+ <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+ <reference bind="setVTViewTemplateProvider" interface="org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider" name="VTViewTemplateProvider"/>
+ <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.table.EMFFormsSpreadsheetTableControlRendererService"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/table/EMFFormsSpreadsheetTableControlRendererService.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/table/EMFFormsSpreadsheetTableControlRendererService.java
index 452ee90..491a9fc 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/table/EMFFormsSpreadsheetTableControlRendererService.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/table/EMFFormsSpreadsheetTableControlRendererService.java
@@ -56,7 +56,7 @@
*
* @param vtViewTemplateProvider the VTViewTemplateProvider to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setVTViewTemplateProvider(VTViewTemplateProvider vtViewTemplateProvider) {
this.vtViewTemplateProvider = vtViewTemplateProvider;
}
@@ -66,7 +66,7 @@
*
* @param reportService the reportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -76,7 +76,7 @@
*
* @param emfformsDatabinding The EMFFormsDatabindingEMF to use
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEmfformsDatabinding(EMFFormsDatabindingEMF emfformsDatabinding) {
this.emfformsDatabinding = emfformsDatabinding;
}
@@ -86,7 +86,7 @@
*
* @param emfformsLabelProvider The EMFFormsLabelProvider to use
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEmfformsLabelProvider(EMFFormsLabelProvider emfformsLabelProvider) {
this.emfformsLabelProvider = emfformsLabelProvider;
}
@@ -96,7 +96,7 @@
*
* @param emfFormsIdProvider the EMFFormsIdProvider to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEmfFormsIdProvider(EMFFormsIdProvider emfFormsIdProvider) {
this.emfFormsIdProvider = emfFormsIdProvider;
}
@@ -106,7 +106,7 @@
*
* @param converterRegistry the converter registry
*/
- @Reference
+ @Reference(unbind = "-")
public void setConverterRegistry(EMFFormsSpreadsheetValueConverterRegistry converterRegistry) {
this.converterRegistry = converterRegistry;
}
@@ -116,7 +116,7 @@
*
* @param formatDescriptionProvider the formatDescriptionProvider
*/
- @Reference
+ @Reference(unbind = "-")
public void setFormatDescriptionProvider(EMFFormsSpreadsheetFormatDescriptionProvider formatDescriptionProvider) {
this.formatDescriptionProvider = formatDescriptionProvider;
}
@@ -126,7 +126,7 @@
*
* @param domainExpander the EMFFormsDomainExpander
*/
- @Reference
+ @Reference(unbind = "-")
public void setEMFFormsDomainExpander(EMFFormsDomainExpander domainExpander) {
this.domainExpander = domainExpander;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
index ffdf10a..271ed98 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer;version="1.0.0";x-internal:=true
Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetContainerRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetElementRendererService.xml,OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetViewRendererService.xml
@@ -19,10 +19,10 @@
org.eclipse.core.databinding.observable.value;version="0.0.0",
org.eclipse.emf.databinding;version="0.0.0",
org.eclipse.emf.ecore.xmi;version="0.0.0",
- org.eclipse.emf.ecp.view.spi.context;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.spi.context;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.10.0,2.0.0)",
org.osgi.framework;version="1.6.0",
org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService.xml b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService.xml
index fe6564c..a4ce7d2 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService.xml
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService.xml
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--Generated by DS Annotation Builder [src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetControlRendererService.java]-->
-<scr:component name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0">
- <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService"/>
- <service>
- <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
- </service>
- <reference name="VTViewTemplateProvider" interface="org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider" bind="setVTViewTemplateProvider"/>
- <reference name="ReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" bind="setReportService"/>
- <reference name="EmfformsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" bind="setEmfformsDatabinding"/>
- <reference name="EmfformsLabelProvider" interface="org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider" bind="setEmfformsLabelProvider"/>
- <reference name="EmfFormsIdProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsIdProvider" bind="setEmfFormsIdProvider"/>
- <reference name="ConverterRegistry" interface="org.eclipse.emfforms.spi.spreadsheet.core.converter.EMFFormsSpreadsheetValueConverterRegistry" bind="setConverterRegistry"/>
- <reference name="FormatDescriptionProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetFormatDescriptionProvider" bind="setFormatDescriptionProvider"/>
- <reference name="EMFFormsDomainExpander" interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDomainExpander" bind="setEMFFormsDomainExpander"/>
-</scr:component>
+<?xml version="1.0" encoding="UTF-8"?>
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService">
+ <implementation class="org.eclipse.emfforms.internal.spreadsheet.core.renderer.EMFFormsSpreadsheetControlRendererService"/>
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetRendererService"/>
+ </service>
+ <reference bind="setConverterRegistry" interface="org.eclipse.emfforms.spi.spreadsheet.core.converter.EMFFormsSpreadsheetValueConverterRegistry" name="ConverterRegistry"/>
+ <reference bind="setEMFFormsDomainExpander" interface="org.eclipse.emfforms.spi.core.services.domainexpander.EMFFormsDomainExpander" name="EMFFormsDomainExpander"/>
+ <reference bind="setEmfFormsIdProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsIdProvider" name="EmfFormsIdProvider"/>
+ <reference bind="setEmfformsDatabinding" interface="org.eclipse.emfforms.spi.core.services.databinding.emf.EMFFormsDatabindingEMF" name="EmfformsDatabinding"/>
+ <reference bind="setEmfformsLabelProvider" interface="org.eclipse.emfforms.spi.core.services.label.EMFFormsLabelProvider" name="EmfformsLabelProvider"/>
+ <reference bind="setFormatDescriptionProvider" interface="org.eclipse.emfforms.spi.spreadsheet.core.EMFFormsSpreadsheetFormatDescriptionProvider" name="FormatDescriptionProvider"/>
+ <reference bind="setReportService" interface="org.eclipse.emfforms.spi.common.report.ReportService" name="ReportService"/>
+ <reference bind="setVTViewTemplateProvider" interface="org.eclipse.emf.ecp.view.template.model.VTViewTemplateProvider" name="VTViewTemplateProvider"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetContainerRendererService.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetContainerRendererService.java
index 4f5c0d1..d300b8c 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetContainerRendererService.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetContainerRendererService.java
@@ -42,7 +42,7 @@
*
* @param reportService the reportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetControlRendererService.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetControlRendererService.java
index 91fd08a..7d4a44b 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetControlRendererService.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetControlRendererService.java
@@ -50,7 +50,7 @@
*
* @param vtViewTemplateProvider the VTViewTemplateProvider to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setVTViewTemplateProvider(VTViewTemplateProvider vtViewTemplateProvider) {
this.vtViewTemplateProvider = vtViewTemplateProvider;
}
@@ -60,7 +60,7 @@
*
* @param reportService the reportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -70,7 +70,7 @@
*
* @param emfformsDatabinding The EMFFormsDatabinding to use
*/
- @Reference
+ @Reference(unbind = "-")
public void setEmfformsDatabinding(EMFFormsDatabindingEMF emfformsDatabinding) {
this.emfformsDatabinding = emfformsDatabinding;
}
@@ -80,7 +80,7 @@
*
* @param emfformsLabelProvider The EMFFormsLabelProvider to use
*/
- @Reference
+ @Reference(unbind = "-")
public void setEmfformsLabelProvider(EMFFormsLabelProvider emfformsLabelProvider) {
this.emfformsLabelProvider = emfformsLabelProvider;
}
@@ -90,7 +90,7 @@
*
* @param emfFormsIdProvider the EMFFormsIdProvider to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setEmfFormsIdProvider(EMFFormsIdProvider emfFormsIdProvider) {
this.emfFormsIdProvider = emfFormsIdProvider;
}
@@ -100,7 +100,7 @@
*
* @param converterRegistry the converter registry
*/
- @Reference
+ @Reference(unbind = "-")
public void setConverterRegistry(EMFFormsSpreadsheetValueConverterRegistry converterRegistry) {
this.converterRegistry = converterRegistry;
}
@@ -110,7 +110,7 @@
*
* @param formatDescriptionProvider the formatDescriptionProvider
*/
- @Reference
+ @Reference(unbind = "-")
public void setFormatDescriptionProvider(EMFFormsSpreadsheetFormatDescriptionProvider formatDescriptionProvider) {
this.formatDescriptionProvider = formatDescriptionProvider;
}
@@ -120,7 +120,7 @@
*
* @param domainExpander the EMFFormsDomainExpander
*/
- @Reference
+ @Reference(unbind = "-")
public void setEMFFormsDomainExpander(EMFFormsDomainExpander domainExpander) {
this.domainExpander = domainExpander;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetViewRendererService.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetViewRendererService.java
index 3fad6b5..dadc956 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetViewRendererService.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer/src/org/eclipse/emfforms/internal/spreadsheet/core/renderer/EMFFormsSpreadsheetViewRendererService.java
@@ -42,7 +42,7 @@
*
* @param reportService the reportService to set
*/
- @Reference
+ @Reference(unbind = "-")
protected void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..960a807
--- /dev/null
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
index d3f6149..6657f4f 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/META-INF/MANIFEST.MF
@@ -11,19 +11,19 @@
org.eclipse.emfforms.spi.spreadsheet.core;version="1.0.0",
org.eclipse.emfforms.spi.spreadsheet.core.converter;version="1.0.0",
org.eclipse.emfforms.spi.spreadsheet.core.transfer;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)",
org.apache.poi;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/EMFFormsSpreadsheetFormatDescriptionProviderImpl.xml,
OSGI-INF/EMFFormsSpreadsheetMultiAttributeConverter.xml,
@@ -35,7 +35,7 @@
OSGI-INF/org.eclipse.emfforms.internal.spreadsheet.core.EMFFormsSpreadsheetRendererFactoryImpl.xml
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.localization;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.10.0,2.0.0)",
org.osgi.framework;version="1.6.0",
org.osgi.service.component.annotations;version="1.2.0"
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiAttributeConverter.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiAttributeConverter.java
index a98895f..33d44e4 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiAttributeConverter.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiAttributeConverter.java
@@ -59,7 +59,7 @@
*
* @param databinding the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setDatabinding(EMFFormsDatabindingEMF databinding) {
this.databinding = databinding;
}
@@ -69,7 +69,7 @@
*
* @param localeProvider the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
protected void setEMFFormsLocaleProvider(EMFFormsLocaleProvider localeProvider) {
this.localeProvider = localeProvider;
}
@@ -79,7 +79,7 @@
*
* @param reportService the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -111,7 +111,7 @@
@Override
public void setCellValue(Cell cell, Object fromObject, EStructuralFeature eStructuralFeature,
ViewModelContext viewModelContext)
- throws EMFFormsConverterException {
+ throws EMFFormsConverterException {
final EDataType eDataType = EAttribute.class.cast(eStructuralFeature).getEAttributeType();
final EFactory eFactory = eDataType.getEPackage().getEFactoryInstance();
final StringBuilder result = new StringBuilder();
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiReferenceConverter.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiReferenceConverter.java
index 554a98e..fca1493 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiReferenceConverter.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetMultiReferenceConverter.java
@@ -54,7 +54,7 @@
*
* @param databinding the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setDatabinding(EMFFormsDatabindingEMF databinding) {
this.databinding = databinding;
}
@@ -64,7 +64,7 @@
*
* @param reportService the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -97,7 +97,7 @@
@Override
public void setCellValue(Cell cell, Object values, EStructuralFeature eStructuralFeature,
ViewModelContext viewModelContext)
- throws EMFFormsConverterException {
+ throws EMFFormsConverterException {
if (values == null) {
return;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java
index e3f2b67..d8ab49c 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleAttributeConverter.java
@@ -59,7 +59,7 @@
*
* @param databinding the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setDatabinding(EMFFormsDatabindingEMF databinding) {
this.databinding = databinding;
}
@@ -69,7 +69,7 @@
*
* @param reportService the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setReportService(ReportService reportService) {
this.reportService = reportService;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleReferenceConverter.java b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleReferenceConverter.java
index 13db46f..c5d99f7 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleReferenceConverter.java
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.core/src/org/eclipse/emfforms/internal/spreadsheet/core/converter/EMFFormsSpreadsheetSingleReferenceConverter.java
@@ -49,7 +49,7 @@
*
* @param databinding the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setDatabinding(EMFFormsDatabindingEMF databinding) {
this.databinding = databinding;
}
@@ -59,7 +59,7 @@
*
* @param reportService the service
*/
- @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ @Reference(cardinality = ReferenceCardinality.MANDATORY, unbind = "-")
public void setReportService(ReportService reportService) {
this.reportService = reportService;
}
@@ -91,7 +91,7 @@
@Override
public void setCellValue(Cell cell, Object value, EStructuralFeature eStructuralFeature,
ViewModelContext viewModelContext)
- throws EMFFormsConverterException {
+ throws EMFFormsConverterException {
if (value == null) {
return;
}
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
index b773555..678d0cb 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.file/META-INF/MANIFEST.MF
@@ -7,11 +7,11 @@
Export-Package: org.eclipse.emfforms.internal.spreadsheet.file;version="1.0.0";x-internal:=true,
org.eclipse.emfforms.internal.spreadsheet.file.messages;version="1.0.0";x-internal:=true,
org.eclipse.emfforms.spi.spreadsheet.file;version="1.0.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="[1.2.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
index 00e1a78..0dd1572 100644
--- a/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
+++ b/bundles/spreadsheet/org.eclipse.emfforms.spreadsheet.stream/META-INF/MANIFEST.MF
@@ -8,10 +8,10 @@
org.eclipse.emfforms.internal.spreadsheet.stream.messages;version="1.0.0";x-internal:=true,
org.eclipse.emfforms.spi.spreadsheet.stream;version="1.0.0"
Require-Bundle: org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.osgi.util;version="1.1.0",
org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
index e4180db..0e2f689 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample Application e3
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e3;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Framework
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product
index a7d34a1..1098a64 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/makeithappen_e3.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="MakeItHappen Sample e3 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e3" id="org.eclipse.emf.ecp.makeithappen.application.sample.e3.product" application="org.eclipse.emf.ecp.makeithappen.application.sample.e3.application" version="1.9.0" useFeatures="false" includeLaunchers="true">
+<product name="MakeItHappen Sample e3 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e3" id="org.eclipse.emf.ecp.makeithappen.application.sample.e3.product" application="org.eclipse.emf.ecp.makeithappen.application.sample.e3.application" version="1.10.0" useFeatures="false" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
index 8d081a8..53e816e 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e3/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
index 612de64..98bfc91 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample Application e4
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.e4;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.10.0";x-internal:=true
Require-Bundle: javax.inject;bundle-version="1.0.0",
org.eclipse.core.runtime;bundle-version="[3.9.100,4.0.0)",
org.eclipse.swt;bundle-version="[3.102.1,4.0.0)",
@@ -16,9 +16,9 @@
org.eclipse.e4.ui.di;bundle-version="[1.0.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.1,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.annotation;version="1.0.0"
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product
index a20592d..e417648 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/makeithappen_e4.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="MakeItHappen Sample e4 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e4" id="org.eclipse.emf.ecp.makeithappen.application.sample.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.9.0" useFeatures="false" includeLaunchers="true">
+<product name="MakeItHappen Sample e4 Product" uid="org.eclipse.emf.ecp.makeithappen.sample.product.e4" id="org.eclipse.emf.ecp.makeithappen.application.sample.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.10.0" useFeatures="false" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
index 6036757..37d11ea 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
index cd58be8..b8d6e38 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample J2ee RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee;version="1.4.0";x-internal:=true
Require-Bundle: org.eclipse.rap.rwt;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.rap.jface;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
org.eclipse.rap.jface.databinding;bundle-version="[2.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/makeithappenApplicationConfiguration.xml
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
index 4f438bb..a04285e 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/makeithappen_RAP.target
@@ -5,7 +5,7 @@
<unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_19"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_110"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.rap.feature.feature.group" version="0"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
index 17294c5..167c673 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap.j2ee/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
index 7c553a5..4cf2513 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: MakeItHappen Sample RAP Application
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.application.sample.rap;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Framework
Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.rap;version="1.0.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.rap.ui.workbench;bundle-version="[2.3.0,4.0.0)",
org.eclipse.rap.jface;bundle-version="[2.3.0,4.0.0)",
org.eclipse.rap.ui;bundle-version="[2.3.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
index 4f438bb..a04285e 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/makeithappen_RAP.target
@@ -5,7 +5,7 @@
<unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_19"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_110"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.rap.feature.feature.group" version="0"/>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
index 2a7e032..6e88aa9 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.rap/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml b/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
index b3f217ad..dbe67da 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.makeithappen.feature"
label="EMF Forms MakeItHappen Example (Target Feature)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.makeithappen.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
index 28d94be..0fe2fac 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.feature/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.makeithappen.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
index 1fcfe2c..20c2bc0 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.makeithappen.model.task.provider.TaskEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
index 23ce3c5..6d7181c 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.edit/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
index d4a9acd..7036003 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.eclipse.emf.ecp.makeithappen.model.viewmodel
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model.viewmodel;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)"
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
index 18b55db..9fcdc60 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model.viewmodel/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
index 693dd16..f0c3c74 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.9.0",
- org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.9.0",
- org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.10.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.10.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
index ae173a7..27cac65 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.model/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
index 73d8431..89fd916 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: EmailControl
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.email.renderer;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.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.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
index 88f4776..b06c9ea 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.email.renderer/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
index 652a0e1..37ca9a3 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: Expandbar Group Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.view.group.renderer;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: lib/org.eclipse.nebula.widgets.pgroup_1.0.0.201310241250.jar,
.
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.9.0",
+Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.10.0",
org.eclipse.nebula.widgets.pgroup;version="1.0.0",
org.eclipse.nebula.widgets.pgroup.internal;version="1.0.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Service-Component: OSGI-INF/pGroupRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
index eb4fa60..ca4d2a2 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.view.group.renderer/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -15,5 +15,5 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
index dad8cf8..b1c50c4 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.ecp.makeithappen.wizards/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Make It Happen Examples
Bundle-SymbolicName: org.eclipse.emf.ecp.makeithappen.wizards;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.makeithappen.internal.wizards.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.common.ui;bundle-version="[2.5.0,3.0.0)",
diff --git a/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
index 7b3f485..f77ea11 100644
--- a/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
+++ b/examples/org.eclipse.emf.ecp.makeithappen.wizards/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.examples/</relativePath>
</parent>
@@ -14,7 +14,7 @@
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
index 5b6ec98..e9b89d2 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
@@ -12,12 +12,12 @@
<feature
id="org.eclipse.emf.ecp.cdo.feature"
label="ECP CDO Integration (Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.cdo.core"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
Integration of the CDO model repository.
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/pom.xml b/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
index 6e2ed61..1b9f602 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.cdo.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml b/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
index e2b2ade..4428d06 100644
--- a/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.changebroker.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.changebroker.feature"
label="ECP Change Broker Feature (do not install into IDE)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.changebroker"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
Generic Observer Bus for EMF Notifications including an ECP/EMFStore-Bridge.
diff --git a/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml b/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
index ce02be4..7ce8509 100644
--- a/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.changebroker.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.changebroker.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
index ea02722..65daddb 100644
--- a/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e3.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.demo.e3.feature"
label="ECP e3 Demo Application"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.application.e3"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml b/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
index bde46fe..43c14df 100644
--- a/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.demo.e3.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.demo.e3.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
index 86a5da7..11d8e3d 100644
--- a/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.demo.e4.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.demo.e4.feature"
label="ECP e4 Demo Application"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.application.e4"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
index a96f4bc..a6ede67 100644
--- a/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.demo.e4.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.demo.e4.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml b/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
index 714e995..bc4f119 100644
--- a/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.diffmerge.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.diffmerge.feature"
label="DiffMerge Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.diffmerge.context"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml b/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
index ea8ee55..e750766 100644
--- a/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.diffmerge.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.diffmerge.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
index a388515..e1f5538 100644
--- a/features/org.eclipse.emf.ecp.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.e3.feature"
label="ECP 3.x UI Integration"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.ui.e3"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
Integration of the EMF Client Platform UI into the Eclipse 3.x workbench, including views and perspectives.
diff --git a/features/org.eclipse.emf.ecp.e3.feature/pom.xml b/features/org.eclipse.emf.ecp.e3.feature/pom.xml
index 415197c..b2511ea 100644
--- a/features/org.eclipse.emf.ecp.e3.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.e3.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.e3.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.e4.feature/feature.xml
index e2ee259..18817df 100644
--- a/features/org.eclipse.emf.ecp.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.e4.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.e4.feature"
label="ECP e4 UI Integration"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.ui.e4"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.e4.feature/pom.xml
index 5bd24ac..8c338e9 100644
--- a/features/org.eclipse.emf.ecp.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.e4.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.e4.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml b/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
index d0196c2..b8e9731 100644
--- a/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ecore.editor.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.ecore.editor.feature"
label="Ecore Editor Wizard Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.ecore.editor.ui"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml b/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
index 51652ac..9b9457b 100644
--- a/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ecore.editor.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ecore.editor.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.ecore.feature/feature.xml b/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
index b5fa786..295eae7 100644
--- a/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.ecore.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.ecore.feature"
label="EMF Forms Ecore Model Controls"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.edit.ecore.swt"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.ecore.feature/pom.xml b/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
index 78ac9cb..48f16d4 100644
--- a/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.ecore.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ecore.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
index f163767..501ab3c 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
@@ -5,7 +5,7 @@
version="1.0.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml b/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
index acd1216..43124b7 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
index 0bbac95..84e00e8 100644
--- a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.emfforms.idetooling.feature"
label="EMF Forms IDE Tooling"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
index 8eb35d2..a79389d 100644
--- a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfforms.idetooling.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
index dded321..36a8429 100644
--- a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.emfforms.runtime.feature"
label="EMF Forms Runtime"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
index 8ba4d1a..8a40eb8 100644
--- a/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.runtime.feature/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfforms.runtime.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
index 3537661..b954fbc 100644
--- a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.emfforms.sdk.feature"
label="EMF Forms SDK"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
@@ -108,6 +108,10 @@
version="0.0.0"/>
<includes
+ id="org.eclipse.emf.ecp.view.edapt.feature.source"
+ version="0.0.0"/>
+
+ <includes
id="org.eclipse.emfforms.editor.feature.source"
version="0.0.0"/>
diff --git a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
index 1fae59e..53acfc2 100644
--- a/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfforms.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfforms.sdk.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
index a30cb1a..f8e41d1 100644
--- a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.emfstore.feature"
label="ECP EMFStore Integration"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.emfstore.core"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml b/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
index 85e791c..c4c012a 100644
--- a/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfstore.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
index 42cb492..04afed5 100644
--- a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.examplemodel.ui.feature"
label="Example Model UI Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.examplemodel.ui"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
index 64c1477..4a82227 100644
--- a/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.examplemodel.ui.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.examplemodel.ui.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.feature/feature.xml b/features/org.eclipse.emf.ecp.feature/feature.xml
index 4ac33dc..d24e2f4 100644
--- a/features/org.eclipse.emf.ecp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.feature/feature.xml
@@ -12,12 +12,12 @@
<feature
id="org.eclipse.emf.ecp.feature"
label="ECP Core"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.core"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
The core platform containing the model workspace, the navigator, the editor and the repository browser.
diff --git a/features/org.eclipse.emf.ecp.feature/pom.xml b/features/org.eclipse.emf.ecp.feature/pom.xml
index bf71326..c9d5128 100644
--- a/features/org.eclipse.emf.ecp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.license.feature/feature.xml b/features/org.eclipse.emf.ecp.license.feature/feature.xml
index 8cfcc70..82215e5 100644
--- a/features/org.eclipse.emf.ecp.license.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.license.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.license.feature"
label="EMF Client Platform License"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.emf.ecp.license.feature/pom.xml b/features/org.eclipse.emf.ecp.license.feature/pom.xml
index bc99060..7f46d9e 100644
--- a/features/org.eclipse.emf.ecp.license.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.license.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.license.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.rap.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
index ddf1994..c4f198a 100644
--- a/features/org.eclipse.emf.ecp.rap.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.rap.feature"
label="ECP RAP Demo Application (Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.rap"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.rap.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.feature/pom.xml
index 986dea2..1df4bfd 100644
--- a/features/org.eclipse.emf.ecp.rap.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.rap.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
index f2c9d77..8fdf86b 100644
--- a/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.rap.sdk.feature"
label="ECP RAP SDK (Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
index 91d7b9e..83d370e 100644
--- a/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.rap.sdk.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
index dc43d13..4fba62f 100644
--- a/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.util.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.rap.util.feature"
label="ECP RAP UI Integration"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.rap.util"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml b/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
index aac2351..ef0388c 100644
--- a/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.rap.util.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.rap.util.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml b/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
index cbc0e08..d9d9502 100644
--- a/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.sdk.e4.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.sdk.e4.feature"
label="ECP SDK e4 (Target Feature)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml b/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
index dc0c685..d1441eb 100644
--- a/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.sdk.e4.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.sdk.e4.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
index d25d66e..ad75cc8 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.sdk.feature"
label="ECP SDK 3.x"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
index dba0e32..b97d036 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.sdk.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.target.feature/feature.xml b/features/org.eclipse.emf.ecp.target.feature/feature.xml
index e3cb10b..815a6df 100644
--- a/features/org.eclipse.emf.ecp.target.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.ecp.target.feature"
label="ECP Target Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
The target platform feature for the EMF Client Platform, for developer use only.
diff --git a/features/org.eclipse.emf.ecp.target.feature/pom.xml b/features/org.eclipse.emf.ecp.target.feature/pom.xml
index 6bea994..7d62809 100644
--- a/features/org.eclipse.emf.ecp.target.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.target.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.transaction.feature/feature.xml b/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
index 0a3f32a..ce0ca73 100644
--- a/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.transaction.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.transaction.feature"
label="ECP Transactional Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.ui.transaction"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.transaction.feature/pom.xml b/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
index 49343e2..a578a2e 100644
--- a/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.transaction.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.transaction.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml b/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
index f1758a9..6c33575 100644
--- a/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.validation.view.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.validation.view.feature"
label="ECP Validation View (Highly Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.ui.validation"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml b/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
index ea64312..0812f06 100644
--- a/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.validation.view.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation.view.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml b/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
index dbdb8a2..735bcc5 100644
--- a/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.categorization.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.categorization.feature"
label="EMF Forms Categorization Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.categorization.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml b/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
index ecf0eb0..4d44209 100644
--- a/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.categorization.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.categorization.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
index e6d83b5..012b803 100644
--- a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.compoundcontrol.feature"
label="EMF Forms Compound Control Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.compoundcontrol.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
index aa70a30..5088488 100644
--- a/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.compoundcontrol.feature/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
diff --git a/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml b/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
index bde01b4..d19b338 100644
--- a/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.custom.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.custom.feature"
label="EMF Forms Custom Control Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.custom.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml b/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
index 9d2067d..9665ebc 100644
--- a/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.custom.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.custom.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.di.feature/feature.xml b/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
index 60ea391..f03e35a 100644
--- a/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.di.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.di.feature"
label="EMFForms Dependency Injection Feature (Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.model.common.di"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.di.feature/pom.xml b/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
index 85b108a..fd520ae 100644
--- a/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.di.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
diff --git a/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml b/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
index 2451c9f..dfab8f7 100644
--- a/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.edapt.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.edapt.feature"
label="EMF Forms IDE Tooling Edapt View Model Migration Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.edapt"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml b/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
index 79783cc..bf5f2b8 100644
--- a/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.edapt.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.edapt.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.view.group.feature/feature.xml b/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
index 4bb97a9..2b03722 100644
--- a/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.group.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.group.feature"
label="EMF Forms Group Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.group.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.group.feature/pom.xml b/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
index b5503c6..77f3701 100644
--- a/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.group.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.group.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
index ea18601..30d8258 100644
--- a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature"
label="EMFForms Collapsible Group Renderer using Nebula PGroup"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
index 18ed60c..ee3dce1 100644
--- a/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
index 3fdaba8..fa5d21f 100644
--- a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.groupedgrid.feature"
label="EMF Forms Grouped Grid Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.groupedgrid.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
index 6bdf5eb..2617ee7 100644
--- a/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.groupedgrid.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.groupedgrid.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml b/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
index 16d2615..f8936fb 100644
--- a/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.horizontal.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.horizontal.feature"
label="EMF Forms Horizontal Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.horizontal.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml b/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
index da458a1..0e56e55 100644
--- a/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.horizontal.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.horizontal.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
index 6920112..d5f364f 100644
--- a/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.indexdmr.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.indexdmr.feature"
label="EMFForms Index DMR Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.indexdmr.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
index 3660acb..0d2427a 100644
--- a/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.indexdmr.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.indexdmr.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
index b2ece8d..c06cf32 100644
--- a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.keyattributedmr.feature"
label="Key Attribute DMR Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.keyattributedmr.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
index 4fd9ff9..6e824ed 100644
--- a/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.keyattributedmr.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.keyattributedmr.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.label.feature/feature.xml b/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
index 146fce1..9d88056 100644
--- a/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.label.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.label.feature"
label="EMF Forms Label Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.label.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.label.feature/pom.xml b/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
index c2fd0eb..830524a 100644
--- a/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.label.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.label.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
index c48bad9..324ee6b 100644
--- a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.mappingdmr.feature"
label="Mapping DMR Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.mappingdmr.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
index 377f696..906d5cf 100644
--- a/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.mappingdmr.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.mappingdmr.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
index 2c03828..6c3ed4d 100644
--- a/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.controls.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.model.controls.feature"
label="EMF Forms View Model Controls"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.ui.view.editor.controls"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
index 029f8c0..e48f299 100644
--- a/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.controls.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.controls.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
index 38547b7..f03a4e6 100644
--- a/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.editor.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.model.editor.feature"
label="EMF Forms View Model Wizard"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.model.editor"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
index 771b7f2..dabaa16 100644
--- a/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.editor.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.editor.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.model.feature/ECP IDE Tooling.launch b/features/org.eclipse.emf.ecp.view.model.feature/ECP IDE Tooling.launch
index f407374..c0f5b89 100644
--- a/features/org.eclipse.emf.ecp.view.model.feature/ECP IDE Tooling.launch
+++ b/features/org.eclipse.emf.ecp.view.model.feature/ECP IDE Tooling.launch
@@ -64,8 +64,8 @@
<setEntry value="org.eclipse.platform:default"/>
<setEntry value="org.eclipse.rcp:default"/>
</setAttribute>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.apache.ant@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.svggen@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edapt.common@default:default,org.eclipse.emf.edapt.declaration@default:default,org.eclipse.emf.edapt.history@default:default,org.eclipse.emf.edapt.migration@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.ui.rcp@default:false,org.eclipse.emf.emfstore.client.ui@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.ecore@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.h2@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.ide.editor.view.templatebridge@default:default,org.eclipse.emf.ecp.application.e3@default:default,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core.emffilter@default:default,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.doc@default:default,org.eclipse.emf.ecp.ecore.editor.ui@default:default,org.eclipse.emf.ecp.ecore.editor@default:default,org.eclipse.emf.ecp.edit.ecore.swt@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.emfstore.ui.search@default:default,org.eclipse.emf.ecp.emfstore.ui@default:default,org.eclipse.emf.ecp.examplemodel.ui@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.ide.editor.view@default:default,org.eclipse.emf.ecp.ide.editor.viewmodel@default:default,org.eclipse.emf.ecp.ide.util@default:default,org.eclipse.emf.ecp.ide.view.service@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.ecp.makeithappen.wizards@default:default,org.eclipse.emf.ecp.ui.e3@default:default,org.eclipse.emf.ecp.ui.rcp@default:false,org.eclipse.emf.ecp.ui.transaction@default:default,org.eclipse.emf.ecp.ui.view.editor.controls@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.validation.connector@default:default,org.eclipse.emf.ecp.validation@default:default,org.eclipse.emf.ecp.view.categorization.model.edit@default:default,org.eclipse.emf.ecp.view.categorization.model@default:default,org.eclipse.emf.ecp.view.categorization.swt@default:default,org.eclipse.emf.ecp.view.context.locale@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.custom.model.edit@default:default,org.eclipse.emf.ecp.view.custom.model@default:default,org.eclipse.emf.ecp.view.custom.ui.swt@default:default,org.eclipse.emf.ecp.view.edapt@default:default,org.eclipse.emf.ecp.view.group.model.edit@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.group.ui.swt@default:default,org.eclipse.emf.ecp.view.groupedgrid.model.edit@default:default,org.eclipse.emf.ecp.view.groupedgrid.model@default:default,org.eclipse.emf.ecp.view.groupedgrid.ui.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model.edit@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default,org.eclipse.emf.ecp.view.indexdmr.model.edit@default:default,org.eclipse.emf.ecp.view.indexdmr.model@default:default,org.eclipse.emf.ecp.view.label.model.edit@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.label.ui.swt@default:default,org.eclipse.emf.ecp.view.mappingdmr.model.edit@default:default,org.eclipse.emf.ecp.view.mappingdmr.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.editor@default:default,org.eclipse.emf.ecp.view.model.preview.common@default:default,org.eclipse.emf.ecp.view.model.preview.e3@default:default,org.eclipse.emf.ecp.view.model.project.installer@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.rule.model.edit@default:default,org.eclipse.emf.ecp.view.rule.model@default:default,org.eclipse.emf.ecp.view.rule@default:default,org.eclipse.emf.ecp.view.stack.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.edapt@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model.edit@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.template.tooling@default:default,org.eclipse.emf.ecp.view.treemasterdetail.model.edit@default:default,org.eclipse.emf.ecp.view.treemasterdetail.model@default:default,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt@default:default,org.eclipse.emf.ecp.view.treemasterdetail.validation@default:default,org.eclipse.emf.ecp.view.unset@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model.edit@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.ecp.view.vertical.ui.swt@default:default,org.eclipse.emf.ecp.workspace.core@default:default,org.eclipse.emf.ecp.workspace.ui@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.editor.ecore@default:default,org.eclipse.emfforms.editor.genmodel@default:default,org.eclipse.emfforms.editor@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.controlgrid@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.plugin@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default,org.eclipse.emfforms.swt.treemasterdetail@default:default,org.eclipse.emfforms.view.annotation.model.edit@default:default,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.controlgrid.model.edit@default:default,org.eclipse.emfforms.view.controlgrid.model@default:default,org.eclipse.emfforms.view.model.localization@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,lpg.runtime.java@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.svggen@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:false,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edapt.common@default:default,org.eclipse.emf.edapt.declaration@default:default,org.eclipse.emf.edapt.history@default:default,org.eclipse.emf.edapt.migration@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.ui.rcp@default:false,org.eclipse.emf.emfstore.client.ui@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.ecore@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.search@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.ant.junit@default:false,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.h2@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.application.e3@default:default,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core.emffilter@default:default,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.doc@default:default,org.eclipse.emf.ecp.edit.ecore.swt@default:default,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.emfstore.ui.search@default:default,org.eclipse.emf.ecp.emfstore.ui@default:default,org.eclipse.emf.ecp.examplemodel.ui@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.ide.editor.view@default:default,org.eclipse.emf.ecp.ide.editor.viewmodel@default:default,org.eclipse.emf.ecp.ide.util@default:default,org.eclipse.emf.ecp.ide.view.service@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.ecp.makeithappen.wizards@default:default,org.eclipse.emf.ecp.ui.e3@default:default,org.eclipse.emf.ecp.ui.rcp@default:false,org.eclipse.emf.ecp.ui.transaction@default:default,org.eclipse.emf.ecp.ui.view.editor.controls@default:default,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.validation.connector@default:default,org.eclipse.emf.ecp.validation@default:default,org.eclipse.emf.ecp.view.categorization.model.edit@default:default,org.eclipse.emf.ecp.view.categorization.model@default:default,org.eclipse.emf.ecp.view.categorization.swt@default:default,org.eclipse.emf.ecp.view.context.locale@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.control.multireference@default:default,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.custom.model.edit@default:default,org.eclipse.emf.ecp.view.custom.model@default:default,org.eclipse.emf.ecp.view.custom.ui.swt@default:default,org.eclipse.emf.ecp.view.edapt@default:default,org.eclipse.emf.ecp.view.group.model.edit@default:default,org.eclipse.emf.ecp.view.group.model@default:default,org.eclipse.emf.ecp.view.group.ui.swt@default:default,org.eclipse.emf.ecp.view.groupedgrid.model.edit@default:default,org.eclipse.emf.ecp.view.groupedgrid.model@default:default,org.eclipse.emf.ecp.view.groupedgrid.ui.swt@default:default,org.eclipse.emf.ecp.view.horizontal.model.edit@default:default,org.eclipse.emf.ecp.view.horizontal.model@default:default,org.eclipse.emf.ecp.view.horizontal.ui.swt@default:default,org.eclipse.emf.ecp.view.indexdmr.model.edit@default:default,org.eclipse.emf.ecp.view.indexdmr.model@default:default,org.eclipse.emf.ecp.view.label.model.edit@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.label.ui.swt@default:default,org.eclipse.emf.ecp.view.mappingdmr.model.edit@default:default,org.eclipse.emf.ecp.view.mappingdmr.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.edit@default:default,org.eclipse.emf.ecp.view.model.editor@default:default,org.eclipse.emf.ecp.view.model.preview.common@default:default,org.eclipse.emf.ecp.view.model.preview.e3@default:default,org.eclipse.emf.ecp.view.model.project.installer@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.rule.model.edit@default:default,org.eclipse.emf.ecp.view.rule.model@default:default,org.eclipse.emf.ecp.view.rule@default:default,org.eclipse.emf.ecp.view.stack.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.edapt@default:default,org.eclipse.emf.ecp.view.table.model.edit@default:default,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model.edit@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.template.tooling@default:default,org.eclipse.emf.ecp.view.treemasterdetail.model.edit@default:default,org.eclipse.emf.ecp.view.treemasterdetail.model@default:default,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt@default:default,org.eclipse.emf.ecp.view.treemasterdetail.validation@default:default,org.eclipse.emf.ecp.view.unset@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model.edit@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.ecp.view.vertical.ui.swt@default:default,org.eclipse.emf.ecp.workspace.core@default:default,org.eclipse.emf.ecp.workspace.ui@default:default,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.editor.ecore@default:default,org.eclipse.emfforms.editor.genmodel.util@default:default,org.eclipse.emfforms.editor.genmodel@default:default,org.eclipse.emfforms.editor@default:default,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.controlgrid@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.plugin@default:default,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default,org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default@default:default,org.eclipse.emfforms.swt.treemasterdetail@default:default,org.eclipse.emfforms.view.annotation.model.edit@default:default,org.eclipse.emfforms.view.annotation.model@default:default,org.eclipse.emfforms.view.controlgrid.model.edit@default:default,org.eclipse.emfforms.view.controlgrid.model@default:default,org.eclipse.emfforms.view.model.localization@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="timestamp" value="1366714902913"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/features/org.eclipse.emf.ecp.view.model.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
index 3104ebf..058592d 100644
--- a/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.viewmodel.feature"
label="EMF Forms Core Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.model.feature/pom.xml b/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
index 2013950..a8114f8 100644
--- a/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.model.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.viewmodel.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml b/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
index 01491f9..df9028f 100644
--- a/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.rule.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.rule.feature"
label="EMF Forms Rule Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.rule"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml b/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
index 930c243..06ad871 100644
--- a/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.rule.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.rule.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.section.feature/feature.xml b/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
index 92c9f27..2eb6f78 100644
--- a/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.section.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.section.feature"
label="EMF Forms Section Model (Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.section.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.section.feature/pom.xml b/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
index 727b91e..498a6ae 100644
--- a/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.section.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.section.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml b/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
index 44fac02..c122ad5 100644
--- a/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.stack.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.stack.feature"
label="EMF Forms Stack Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.stack.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml b/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
index 3fa8375..d517d80 100644
--- a/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.stack.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.stack.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
index 6f99600..35c2875 100644
--- a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.table.celleditor.rcp.feature"
label="EMFForms Table UI SWT Additional Cell Editors (non-RAP)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.table.celleditor.rcp"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
index e0f0233..23d27a5 100644
--- a/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.celleditor.rcp.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.celleditor.rcp.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.table.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
index fb3cb09..189dde5 100644
--- a/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.table.feature"
label="EMF Forms Table Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.table.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.table.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
index adb7e0b..95344f6 100644
--- a/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/.project b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/.project
new file mode 100644
index 0000000..4bf1a8e
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/build.properties b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.properties b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.properties
new file mode 100644
index 0000000..1e94656
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.properties
@@ -0,0 +1,7 @@
+# Copyright (c) 2011-2016 EclipseSource Munich GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+description = EMFForms Nebula Grid Table UI Feature.
\ No newline at end of file
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
new file mode 100644
index 0000000..57d6c1a
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature"
+ label="EMF Forms Nebula Grid Table UI Feature"
+ version="1.10.0.qualifier"
+ provider-name="Eclipse Modeling Project"
+ plugin="org.eclipse.emf.ecp.view.table.ui.nebula.grid"
+ license-feature="org.eclipse.emf.ecp.license.feature"
+ license-feature-version="1.10.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.emf.ecp.view.table.ui.nebula.grid"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
new file mode 100644
index 0000000..113412c
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-features-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/.project b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/.project
new file mode 100644
index 0000000..df96817
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.ecp.view.table.ui.rcp.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/build.properties b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.properties b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.properties
new file mode 100644
index 0000000..91dd686
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.properties
@@ -0,0 +1,7 @@
+# Copyright (c) 2011-2014 EclipseSource Munich GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+description = EMF Forms Model for Tables. This Feature also contains the SWT renderer for this model element.
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
new file mode 100644
index 0000000..afc045d
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.ecp.view.table.ui.rcp.feature"
+ label="Feature"
+ version="1.10.0.qualifier"
+ license-feature="org.eclipse.emf.ecp.license.feature"
+ license-feature-version="1.10.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.emf.ecp.view.table.ui.rcp"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
new file mode 100644
index 0000000..3eb0482
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-features-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>org.eclipse.emf.ecp.view.table.ui.rcp.feature</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
index 79ffa62..1601b7a 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature"
label="EMF Forms Persist Table State Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
index 741a094..2bc0c7b 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.template.feature/feature.xml b/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
index 7b5f054..a8cf0a0 100644
--- a/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.template.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.template.feature"
label="EMF Forms Template Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.template.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.template.feature/pom.xml b/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
index 8440705..80e9704 100644
--- a/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.template.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.template.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
index 8f788a7..7f23d41 100644
--- a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.treemasterdetail.feature"
label="EMF Forms Master-Detail Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.treemasterdetail.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
index 926e40f..bd79d15 100644
--- a/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.treemasterdetail.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.treemasterdetail.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml b/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
index be637d8..3de25ca 100644
--- a/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.unset.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.unset.feature"
label="EMF Forms Unset Service"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.view.unset"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml b/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
index 4b0e4a6..7a92d3d 100644
--- a/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.unset.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.unset.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
index 3da2f70..aa79bbd 100644
--- a/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.bean.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.validation.bean.feature"
label="Bean Validation Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.validation.bean"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
index 26e118a..06d4e24 100644
--- a/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.bean.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation.bean.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
index 861dd8b..cc7b0f6 100644
--- a/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.validation.feature"
label="EMF Forms Validation Service"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.validation"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
index e464db3..f14e631 100644
--- a/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml b/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
index 0220295..d0899c1 100644
--- a/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.initial.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.validation.initial.feature"
label="ECP Deep Validation Initial Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.validation"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml b/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
index f818ccd..7c68b88 100644
--- a/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.validation.initial.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation.initial.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml b/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
index b70d061..764e421 100644
--- a/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.vertical.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.vertical.feature"
label="EMF Forms Vertical Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.vertical.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml b/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
index 0e5c3b0..180058c 100644
--- a/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.vertical.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.vertical.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml b/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
index 0f58b73..fb17c8b 100644
--- a/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.viewproxy.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.viewproxy.feature"
label="EMF Forms View Proxy Model"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.viewproxy.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml b/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
index 08021cc..98725bb 100644
--- a/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.viewproxy.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.viewproxy.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
index a04018a..40eb52a 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
@@ -12,12 +12,12 @@
<feature
id="org.eclipse.emf.ecp.workspace.feature"
label="ECP File Integration (Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.workspace.core"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
Integration for file and Eclipse workspace persistence.
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/pom.xml b/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
index 5680982..37c55bf 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.workspace.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.editor.feature/feature.xml b/features/org.eclipse.emfforms.editor.feature/feature.xml
index 2b7e4e2..4e96c5a 100644
--- a/features/org.eclipse.emfforms.editor.feature/feature.xml
+++ b/features/org.eclipse.emfforms.editor.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.editor.feature"
label="EMF Forms Ecore Editor"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.editor"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.editor.feature/pom.xml b/features/org.eclipse.emfforms.editor.feature/pom.xml
index 880f5f5..2d8a5b4 100644
--- a/features/org.eclipse.emfforms.editor.feature/pom.xml
+++ b/features/org.eclipse.emfforms.editor.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.editor.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/.project b/features/org.eclipse.emfforms.editor.genmodel.util.feature/.project
new file mode 100644
index 0000000..35d1394
--- /dev/null
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.editor.genmodel.util.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/build.properties b/features/org.eclipse.emfforms.editor.genmodel.util.feature/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.properties b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.properties
new file mode 100644
index 0000000..140c0ac
--- /dev/null
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.properties
@@ -0,0 +1,7 @@
+# Copyright (c) 2011-2013 EclipseSource Munich GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+description = This feature contains optional utilities for manipulating GenModels.
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
new file mode 100644
index 0000000..e0299fa
--- /dev/null
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emfforms.editor.genmodel.util.feature"
+ label="EMFForms GenModel Editor Util"
+ version="1.10.0.qualifier"
+ provider-name="Eclipse Modeling Project"
+ plugin="org.eclipse.emfforms.editor.genmodel.util"
+ license-feature="org.eclipse.emf.ecp.license.feature"
+ license-feature-version="1.10.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.emfforms.editor.genmodel.util"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
new file mode 100644
index 0000000..f20a2c2
--- /dev/null
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-features-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>org.eclipse.emfforms.editor.genmodel.util.feature</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/.project b/features/org.eclipse.emfforms.rulerepository.feature/.project
new file mode 100644
index 0000000..1935bcc
--- /dev/null
+++ b/features/org.eclipse.emfforms.rulerepository.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.rulerepository.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/build.properties b/features/org.eclipse.emfforms.rulerepository.feature/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/features/org.eclipse.emfforms.rulerepository.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/feature.properties b/features/org.eclipse.emfforms.rulerepository.feature/feature.properties
new file mode 100644
index 0000000..8678ebe
--- /dev/null
+++ b/features/org.eclipse.emfforms.rulerepository.feature/feature.properties
@@ -0,0 +1,7 @@
+# Copyright (c) 2011-2016 EclipseSource Munich GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+description = EMF Forms Rule repository Model. This Feature also contains the edit bundle and the necessary tooling to edit the rule repository..
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
new file mode 100644
index 0000000..6e0e21d
--- /dev/null
+++ b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emfforms.rulerepository.feature"
+ label="EMFForms RuleRepository Feature"
+ version="1.10.0.qualifier"
+ provider-name="Eclipse Modeling Project"
+ plugin="org.eclipse.emfforms.rulerepository.model"
+ image="eclipse_update_120.jpg"
+ license-feature="org.eclipse.emf.ecp.license.feature"
+ license-feature-version="1.10.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.emfforms.rulerepository.model"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emfforms.rulerepository.model.edit"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emfforms.rulerepository.tooling"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/pom.xml b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
new file mode 100644
index 0000000..6caa504
--- /dev/null
+++ b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-features-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>org.eclipse.emfforms.rulerepository.feature</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
index ccb52aa..11f9ad3 100644
--- a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.swt.control.multiattribute.feature"
label="EMFForms SWT Control for Multi EAttribtues"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.swt.control.multiattribute"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
index a44b18b..ca149a5 100644
--- a/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.multiattribute.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.control.multiattribute.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
index 675df0a..8ffbfcf 100644
--- a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.swt.control.text.autocomplete.feature"
label="EMFForms SWT Text Control with Autocomplete Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emfforms.swt.control.text.autocomplete"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
index 6bb12b1..44d6d23 100644
--- a/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.autocomplete.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.control.text.autocomplete.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/.project b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/.project
new file mode 100644
index 0000000..a97e6bf
--- /dev/null
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emfforms.swt.control.text.richtext.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/build.properties b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.properties b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.properties
new file mode 100644
index 0000000..351a2a6
--- /dev/null
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.properties
@@ -0,0 +1,7 @@
+# Copyright (c) 2011-2016 EclipseSource Munich GmbH and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+
+description = EMFForms SWT RichText Control. This feature contains the renderer for a rich text control.
\ No newline at end of file
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
new file mode 100644
index 0000000..de837f0
--- /dev/null
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emfforms.swt.control.text.richtext.feature"
+ label="EMF Forms Rich Text Feature"
+ version="1.10.0.qualifier"
+ provider-name="Eclipse Modeling Project"
+ plugin="org.eclipse.emfforms.swt.control.text.richtext"
+ license-feature="org.eclipse.emf.ecp.license.feature"
+ license-feature-version="1.10.0.qualifier">
+
+ <description>
+ %description
+ </description>
+
+ <copyright url="%copyrightURL">
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <plugin
+ id="org.eclipse.emfforms.swt.control.text.richtext"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
new file mode 100644
index 0000000..b9c36c6
--- /dev/null
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>ecp-features-parent</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
+ </parent>
+ <groupId>org.eclipse.emf.ecp</groupId>
+ <artifactId>org.eclipse.emfforms.swt.control.text.richtext.feature</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml b/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
index e15aa6e..1227426 100644
--- a/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.controlgrid.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.swt.controlgrid.feature"
label="EMFForms Control Grid SWT Feature (Experimental)"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emfforms.view.controlgrid.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml b/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
index 346676d..6169c3f 100644
--- a/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.controlgrid.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.controlgrid.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.view.annotation.feature/feature.xml b/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
index bda7cce..b175457 100644
--- a/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
+++ b/features/org.eclipse.emfforms.view.annotation.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.view.annotation.feature"
label="EMFForms Annotation View Model Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emfforms.view.annotation.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.view.annotation.feature/pom.xml b/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
index 8da6fd1..1d7ea6c 100644
--- a/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
+++ b/features/org.eclipse.emfforms.view.annotation.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.view.annotation.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml b/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
index 8d8a633..9f902ac 100644
--- a/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
+++ b/features/spreadsheet/org.eclipse.emfforms.spreadsheet.feature/feature.xml
@@ -7,7 +7,7 @@
plugin="org.eclipse.emfforms.spreadsheet.core"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
index 1d8d056..ba9a41d 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="%productName" uid="org.eclipse.emf.ecp.3x" id="org.eclipse.emf.ecp.application.e3.product" application="org.eclipse.emf.ecp.application.e3.application" version="1.9.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="%productName" uid="org.eclipse.emf.ecp.3x" id="org.eclipse.emf.ecp.application.e3.product" application="org.eclipse.emf.ecp.application.e3.application" version="1.10.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.emf.ecp.application.e3/icons/eclipse_lg.gif"/>
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
index 7573987..a191081 100644
--- a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
+++ b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.application.e4.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.application.e4.demo" id="org.eclipse.emf.ecp.application.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.9.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="org.eclipse.emf.ecp.e4.application" uid="org.eclipse.emf.ecp.application.e4.demo" id="org.eclipse.emf.ecp.application.e4.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.10.0.qualifier" useFeatures="false" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/releng/org.eclipse.emf.ecp.products/pom.xml b/releng/org.eclipse.emf.ecp.products/pom.xml
index 2683af0..a5ce9e7 100644
--- a/releng/org.eclipse.emf.ecp.products/pom.xml
+++ b/releng/org.eclipse.emf.ecp.products/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.products</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
index b945166..02c3292 100644
--- a/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
+++ b/releng/org.eclipse.emf.ecp.rap.parent/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-rap-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Parent for the rap product. Needed to reduce environments.
diff --git a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
index e8a6fe3..7e92c87 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
+++ b/releng/org.eclipse.emf.ecp.rap.products/org.eclipse.emf.ecp.rap.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="ECP Rap Demo" uid="org.eclipse.emf.ecp.rap.demo" version="1.9.0.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="ECP Rap Demo" uid="org.eclipse.emf.ecp.rap.demo" version="1.10.0" useFeatures="false" includeLaunchers="false">
<aboutInfo>
<image path="icons/eclipse_lg.gif"/>
diff --git a/releng/org.eclipse.emf.ecp.rap.products/pom.xml b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
index 730590e..ae438f0 100644
--- a/releng/org.eclipse.emf.ecp.rap.products/pom.xml
+++ b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-rap-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../org.eclipse.emf.ecp.rap.parent/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.rap.products</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<properties>
diff --git a/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml b/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
index 841579d..c0be2e0 100644
--- a/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.bundles/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -162,6 +162,7 @@
<module>../../bundles/org.eclipse.emf.ecp.view.table.model</module>
<module>../../bundles/org.eclipse.emf.ecp.view.table.model.edit</module>
<module>../../bundles/org.eclipse.emf.ecp.view.table.ui.swt</module>
+ <module>../../bundles/org.eclipse.emf.ecp.view.table.ui.rcp</module>
<module>../../bundles/org.eclipse.emf.ecp.view.table.columnservice</module>
<module>../../bundles/org.eclipse.emf.ecp.view.table.edapt</module>
<module>../../bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp</module>
@@ -295,6 +296,7 @@
<module>../../bundles/org.eclipse.emfforms.view.model.localization</module>
<module>../../bundles/org.eclipse.emfforms.swt.control.text.autocomplete</module>
+ <module>../../bundles/org.eclipse.emfforms.swt.control.text.richtext</module>
<!-- Annotation attachement -->
<module>../../bundles/org.eclipse.emfforms.view.annotation.model</module>
@@ -317,6 +319,7 @@
<module>../../bundles/org.eclipse.emfforms.editor</module>
<module>../../bundles/org.eclipse.emfforms.editor.ecore</module>
<module>../../bundles/org.eclipse.emfforms.editor.genmodel</module>
+ <module>../../bundles/org.eclipse.emfforms.editor.genmodel.util</module>
<module>../../bundles/org.eclipse.emfforms.editor.viewmodel</module>
<!-- EMF2Web -->
@@ -328,6 +331,14 @@
<!-- Helper -->
<module>../../bundles/org.eclipse.emfforms.setup.base</module>
+ <!-- Rule Repository -->
+ <module>../../bundles/org.eclipse.emfforms.rulerepository.model</module>
+ <module>../../bundles/org.eclipse.emfforms.rulerepository.model.edit</module>
+ <module>../../bundles/org.eclipse.emfforms.rulerepository.tooling</module>
+
+ <!-- Nebula Table -->
+ <module>../../bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid</module>
+
</modules>
<build>
diff --git a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
index c99fbe8..1154eea 100644
--- a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-examples-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.features/pom.xml b/releng/org.eclipse.emf.ecp.releng.features/pom.xml
index da47c07..6de2fa5 100644
--- a/releng/org.eclipse.emf.ecp.releng.features/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.features/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -27,6 +27,7 @@
<module>../../features/org.eclipse.emf.ecp.ecore.feature</module>
<module>../../features/org.eclipse.emf.ecp.ecore.editor.feature</module>
<module>../../features/org.eclipse.emfforms.editor.feature</module>
+ <module>../../features/org.eclipse.emfforms.editor.genmodel.util.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.model.editor.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.model.controls.feature</module>
<module>../../features/org.eclipse.emf.ecp.examplemodel.ui.feature</module>
@@ -43,6 +44,7 @@
<module>../../features/org.eclipse.emf.ecp.view.horizontal.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.treemasterdetail.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.table.feature</module>
+ <module>../../features/org.eclipse.emf.ecp.view.table.ui.rcp.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.template.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.mappingdmr.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.stack.feature</module>
@@ -84,6 +86,10 @@
<module>../../features/org.eclipse.emfforms.swt.control.text.autocomplete.feature</module>
+ <module>../../features/org.eclipse.emfforms.swt.control.text.richtext.feature</module>
+
+ <module>../../features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature</module>
+
<module>../../features/org.eclipse.emfforms.view.annotation.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup.feature</module>
@@ -95,6 +101,8 @@
<module>../../features/org.eclipse.emf.ecp.emf2web.feature</module>
<module>../../features/org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature</module>
+
+ <module>../../features/org.eclipse.emfforms.rulerepository.feature</module>
</modules>
<!-- Parent used for features. This POM contains all build steps for code signing. -->
diff --git a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
index 19dfd36..b52f764 100644
--- a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
@@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<profiles>
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index a035299..ab12eab 100644
--- a/releng/org.eclipse.emf.ecp.releng/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng/pom.xml
@@ -5,14 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>0.25.0</tycho-version>
<tycho-extras-version>0.25.0</tycho-extras-version>
<javadoc-version>2.10.3</javadoc-version>
- <ecp-version>1.9.0</ecp-version>
+ <ecp-version>1.10.0</ecp-version>
<javadoc-title>EMF Client Platform ${ecp-version} API</javadoc-title>
<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/releng/org.eclipse.emf.ecp.repository.target/category.xml b/releng/org.eclipse.emf.ecp.repository.target/category.xml
index 1ccad61..59d3d97 100644
--- a/releng/org.eclipse.emf.ecp.repository.target/category.xml
+++ b/releng/org.eclipse.emf.ecp.repository.target/category.xml
@@ -159,6 +159,12 @@
<feature id="org.eclipse.emfforms.swt.control.text.autocomplete.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
+ <feature id="org.eclipse.emfforms.swt.control.text.richtext.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
+ <feature id="org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
<feature id="org.eclipse.emfforms.view.annotation.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.view"/>
</feature>
@@ -180,6 +186,15 @@
<feature id="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
+ <feature id="org.eclipse.emfforms.rulerepository.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.view"/>
+ </feature>
+ <feature id="org.eclipse.emfforms.editor.genmodel.util.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
+ <feature id="org.eclipse.emf.ecp.view.table.ui.rcp.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
<category-def name="org.eclipse.emf.ecp.sdk" label="All SDKs (install one of these)">
<description>
Contains the ECP SDKs. Please install only one of these.
diff --git a/releng/org.eclipse.emf.ecp.repository.target/pom.xml b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
index 8d90a4c..423fdaa 100644
--- a/releng/org.eclipse.emf.ecp.repository.target/pom.xml
+++ b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.site.target.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<!-- see http://www.codetrails.com/blog/maven-tycho-how-to-configure-your-repos-mirror-and-statistics-uris -->
diff --git a/releng/org.eclipse.emf.ecp.repository/category.xml b/releng/org.eclipse.emf.ecp.repository/category.xml
index ecc0fa0..af44541 100644
--- a/releng/org.eclipse.emf.ecp.repository/category.xml
+++ b/releng/org.eclipse.emf.ecp.repository/category.xml
@@ -138,6 +138,12 @@
<feature id="org.eclipse.emfforms.swt.control.text.autocomplete.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
+ <feature id="org.eclipse.emfforms.swt.control.text.richtext.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
+ <feature id="org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
<feature id="org.eclipse.emfforms.view.annotation.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.view"/>
</feature>
@@ -162,6 +168,12 @@
<feature id="org.eclipse.emf.ecp.view.table.ui.swt.persistedstate.feature.source" version="0.0.0">
<category name="org.eclipse.emf.ecp.emfforms"/>
</feature>
+ <feature id="org.eclipse.emfforms.editor.genmodel.util.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
+ <feature id="org.eclipse.emf.ecp.view.table.ui.rcp.feature.source" version="0.0.0">
+ <category name="org.eclipse.emf.ecp.emfforms"/>
+ </feature>
<category-def name="org.eclipse.emf.ecp.sdk" label="All SDKs (install one of these)">
<description>
Contains the ECP SDKs. Please install only one of these.
diff --git a/releng/org.eclipse.emf.ecp.repository/pom.xml b/releng/org.eclipse.emf.ecp.repository/pom.xml
index 400b4f4..609fef5 100644
--- a/releng/org.eclipse.emf.ecp.repository/pom.xml
+++ b/releng/org.eclipse.emf.ecp.repository/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.site.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<!-- see http://www.codetrails.com/blog/maven-tycho-how-to-configure-your-repos-mirror-and-statistics-uris -->
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
index 39c0b82..df7759a 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP.target
@@ -11,7 +11,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
index dffbff9..67290e9 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
@@ -22,13 +22,13 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_19"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_110"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.ecp.target.rap/pom.xml b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
index fa3caef..8df93e5 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rap/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecpRAP</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>
</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
index f2f37b8..506d6f3 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.target
@@ -1,72 +1,986 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="263">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.emfstore.ecore.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/emfstore/releases_18"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.graphiti.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.mockito.mockito-core-hamcrest-modified" version="0.0.0"/>
-<repository location="http://build.eclipse.org/rt/rap/base-platforms/3.1/extra-dependencies/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="javax.validation" version="0.0.0"/>
-<unit id="org.apache.poi.source" version="0.0.0"/>
-<unit id="org.apache.poi" version="0.0.0"/>
-<unit id="org.apache.log4j.source" version="0.0.0"/>
-<unit id="org.objenesis" version="0.0.0"/>
-<unit id="org.objenesis.source" version="0.0.0"/>
-<unit id="org.h2" version="0.0.0"/>
-<unit id="javax.validation.source" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.h2.source" version="0.0.0"/>
-<unit id="com.google.gson.source" version="0.0.0"/>
-<unit id="com.google.gson" version="0.0.0"/>
-<unit id="com.google.guava" version="0.0.0"/>
-<unit id="com.google.guava.source" version="0.0.0"/>
-<unit id="org.hamcrest.core" version="0.0.0"/>
-<unit id="org.hamcrest.library" version="0.0.0"/>
-<unit id="org.hamcrest.library.source" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edapt.runtime.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/edapt/releases/12x"/>
-</location>
-</locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="1472048285">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20160606-1311"/>
+<unit id="org.eclipse.platform.ide" version="4.6.0.I20160606-1100"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.core.databinding" version="1.5.0.v20150422-0725"/>
+<unit id="org.eclipse.core.databinding.beans" version="1.3.0.v20150422-0725"/>
+<unit id="org.eclipse.core.databinding.observable" version="1.5.0.v20150422-0725"/>
+<unit id="org.eclipse.core.databinding.property" version="1.5.0.v20150422-0725"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="1.8.0.v20160606-1028"/>
+<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="1.8.0.v20160606-1028"/>
+<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="1.8.0.v20160606-1028"/>
+<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="1.8.0.v20160606-1028"/>
+<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="1.8.0.v20160606-1028"/>
+<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="1.8.0.v20160606-1028"/>
+<unit id="org.eclipse.emf.emfstore.ecore.feature.feature.group" version="1.8.0.v20160606-1028"/>
+<repository location="http://download.eclipse.org/emfstore/releases_18"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20160606-1100"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
+<unit id="org.eclipse.graphiti.feature.feature.group" version="0.13.0.v20160608-1043"/>
+<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.13.0.v20160608-1043"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.10.0.201606071713"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.10.0.201606071900"/>
+<unit id="org.eclipse.net4j.sdk.feature.group" version="4.5.0.v20160607-1511"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.5.0.v20160607-1511"/>
+<unit id="org.eclipse.pde.feature.group" version="3.12.0.v20160606-1100"/>
+<unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/>
+<unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201605250459"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.mockito.mockito-core-hamcrest-modified" version="1.9.5"/>
+<repository location="http://build.eclipse.org/rt/rap/base-platforms/3.1/extra-dependencies/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
+<unit id="org.apache.poi.source" version="3.9.0.v201405241750"/>
+<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
+<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+<unit id="org.objenesis" version="1.0.0.v201505121915"/>
+<unit id="org.objenesis.source" version="1.0.0.v201505121915"/>
+<unit id="org.h2" version="1.3.168.v201212121212"/>
+<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
+<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<unit id="org.h2.source" version="1.3.168.v201212121212"/>
+<unit id="com.google.gson.source" version="2.2.4.v201311231704"/>
+<unit id="com.google.gson" version="2.2.4.v201311231704"/>
+<unit id="com.google.guava" version="15.0.0.v201403281430"/>
+<unit id="com.google.guava.source" version="15.0.0.v201403281430"/>
+<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
+<unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="1.2.0.201606020942"/>
+<unit id="org.eclipse.emf.edapt.runtime.feature.source.feature.group" version="1.2.0.201606020942"/>
+<repository location="http://download.eclipse.org/edapt/releases/12x"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/nebula/releases/1.0.0"/>
+</location>
+</locations>
+<includeBundles>
+<plugin id="com.google.gson"/>
+<plugin id="com.google.gson.source"/>
+<plugin id="com.google.guava"/>
+<plugin id="com.google.guava.source"/>
+<plugin id="com.ibm.icu"/>
+<plugin id="com.ibm.icu.source"/>
+<plugin id="com.jcraft.jsch"/>
+<plugin id="com.jcraft.jsch.source"/>
+<plugin id="com.sun.el"/>
+<plugin id="com.sun.el.source"/>
+<plugin id="javax.annotation"/>
+<plugin id="javax.annotation.source"/>
+<plugin id="javax.el"/>
+<plugin id="javax.el.source"/>
+<plugin id="javax.inject"/>
+<plugin id="javax.inject.source"/>
+<plugin id="javax.servlet"/>
+<plugin id="javax.servlet.jsp"/>
+<plugin id="javax.servlet.jsp.source"/>
+<plugin id="javax.servlet.source"/>
+<plugin id="javax.validation"/>
+<plugin id="javax.validation.source"/>
+<plugin id="javax.xml"/>
+<plugin id="lpg.runtime.java"/>
+<plugin id="lpg.runtime.java.source"/>
+<plugin id="org.antlr.runtime"/>
+<plugin id="org.antlr.runtime.source"/>
+<plugin id="org.apache.ant"/>
+<plugin id="org.apache.ant.source"/>
+<plugin id="org.apache.batik.css" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.css" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.css.source" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.css.source" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.dom"/>
+<plugin id="org.apache.batik.dom.source"/>
+<plugin id="org.apache.batik.ext.awt"/>
+<plugin id="org.apache.batik.ext.awt.source"/>
+<plugin id="org.apache.batik.svggen"/>
+<plugin id="org.apache.batik.svggen.source"/>
+<plugin id="org.apache.batik.util" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.util" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.util.gui" version="1.7.0.v200903091627"/>
+<plugin id="org.apache.batik.util.gui" version="1.7.0.v200903091627"/>
+<plugin id="org.apache.batik.util.gui.source" version="1.7.0.v200903091627"/>
+<plugin id="org.apache.batik.util.gui.source" version="1.7.0.v200903091627"/>
+<plugin id="org.apache.batik.util.source" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.util.source" version="1.7.0.v201011041433"/>
+<plugin id="org.apache.batik.xml"/>
+<plugin id="org.apache.batik.xml.source"/>
+<plugin id="org.apache.commons.codec"/>
+<plugin id="org.apache.commons.codec.source"/>
+<plugin id="org.apache.commons.httpclient"/>
+<plugin id="org.apache.commons.httpclient.source"/>
+<plugin id="org.apache.commons.jxpath"/>
+<plugin id="org.apache.commons.jxpath.source"/>
+<plugin id="org.apache.commons.lang"/>
+<plugin id="org.apache.commons.lang.source"/>
+<plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
+<plugin id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
+<plugin id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/>
+<plugin id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/>
+<plugin id="org.apache.derby.source"/>
+<plugin id="org.apache.felix.gogo.command"/>
+<plugin id="org.apache.felix.gogo.command.source"/>
+<plugin id="org.apache.felix.gogo.runtime"/>
+<plugin id="org.apache.felix.gogo.runtime.source"/>
+<plugin id="org.apache.felix.gogo.shell"/>
+<plugin id="org.apache.felix.gogo.shell.source"/>
+<plugin id="org.apache.jasper.glassfish"/>
+<plugin id="org.apache.jasper.glassfish.source"/>
+<plugin id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<plugin id="org.apache.log4j" version="1.2.15.v201012070815"/>
+<plugin id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+<plugin id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+<plugin id="org.apache.lucene.analysis"/>
+<plugin id="org.apache.lucene.analysis.source"/>
+<plugin id="org.apache.lucene.core"/>
+<plugin id="org.apache.lucene.core.source"/>
+<plugin id="org.apache.mina.core"/>
+<plugin id="org.apache.mina.core.source"/>
+<plugin id="org.apache.poi"/>
+<plugin id="org.apache.poi.source"/>
+<plugin id="org.apache.sshd.core"/>
+<plugin id="org.apache.sshd.core.source"/>
+<plugin id="org.eclipse.ant.core"/>
+<plugin id="org.eclipse.ant.core.source"/>
+<plugin id="org.eclipse.ant.launching"/>
+<plugin id="org.eclipse.ant.launching.source"/>
+<plugin id="org.eclipse.ant.ui"/>
+<plugin id="org.eclipse.ant.ui.source"/>
+<plugin id="org.eclipse.compare"/>
+<plugin id="org.eclipse.compare.core"/>
+<plugin id="org.eclipse.compare.core.source"/>
+<plugin id="org.eclipse.compare.source"/>
+<plugin id="org.eclipse.core.commands"/>
+<plugin id="org.eclipse.core.commands.source"/>
+<plugin id="org.eclipse.core.contenttype"/>
+<plugin id="org.eclipse.core.contenttype.source"/>
+<plugin id="org.eclipse.core.databinding" version="1.5.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.databinding.beans" version="1.3.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.databinding.beans.source" version="1.3.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.databinding.observable" version="1.5.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.databinding.observable.source" version="1.5.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.databinding.property" version="1.5.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.databinding.property.source" version="1.5.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.databinding.source" version="1.5.0.v20150422-0725"/>
+<plugin id="org.eclipse.core.expressions"/>
+<plugin id="org.eclipse.core.expressions.source"/>
+<plugin id="org.eclipse.core.externaltools"/>
+<plugin id="org.eclipse.core.externaltools.source"/>
+<plugin id="org.eclipse.core.filebuffers"/>
+<plugin id="org.eclipse.core.filebuffers.source"/>
+<plugin id="org.eclipse.core.filesystem"/>
+<plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
+<plugin id="org.eclipse.core.filesystem.source"/>
+<plugin id="org.eclipse.core.jobs"/>
+<plugin id="org.eclipse.core.jobs.source"/>
+<plugin id="org.eclipse.core.net"/>
+<plugin id="org.eclipse.core.net.linux.x86_64"/>
+<plugin id="org.eclipse.core.net.source"/>
+<plugin id="org.eclipse.core.resources"/>
+<plugin id="org.eclipse.core.resources.source"/>
+<plugin id="org.eclipse.core.runtime"/>
+<plugin id="org.eclipse.core.runtime.source"/>
+<plugin id="org.eclipse.core.variables"/>
+<plugin id="org.eclipse.core.variables.source"/>
+<plugin id="org.eclipse.debug.core"/>
+<plugin id="org.eclipse.debug.core.source"/>
+<plugin id="org.eclipse.debug.ui"/>
+<plugin id="org.eclipse.debug.ui.source"/>
+<plugin id="org.eclipse.draw2d"/>
+<plugin id="org.eclipse.draw2d.doc.isv"/>
+<plugin id="org.eclipse.draw2d.source"/>
+<plugin id="org.eclipse.e4.core.commands"/>
+<plugin id="org.eclipse.e4.core.commands.source"/>
+<plugin id="org.eclipse.e4.core.contexts"/>
+<plugin id="org.eclipse.e4.core.contexts.source"/>
+<plugin id="org.eclipse.e4.core.di"/>
+<plugin id="org.eclipse.e4.core.di.annotations"/>
+<plugin id="org.eclipse.e4.core.di.annotations.source"/>
+<plugin id="org.eclipse.e4.core.di.extensions"/>
+<plugin id="org.eclipse.e4.core.di.extensions.source"/>
+<plugin id="org.eclipse.e4.core.di.source"/>
+<plugin id="org.eclipse.e4.core.services"/>
+<plugin id="org.eclipse.e4.core.services.source"/>
+<plugin id="org.eclipse.e4.emf.xpath"/>
+<plugin id="org.eclipse.e4.emf.xpath.source"/>
+<plugin id="org.eclipse.e4.ui.bindings"/>
+<plugin id="org.eclipse.e4.ui.bindings.source"/>
+<plugin id="org.eclipse.e4.ui.css.core"/>
+<plugin id="org.eclipse.e4.ui.css.core.source"/>
+<plugin id="org.eclipse.e4.ui.css.swt"/>
+<plugin id="org.eclipse.e4.ui.css.swt.source"/>
+<plugin id="org.eclipse.e4.ui.css.swt.theme"/>
+<plugin id="org.eclipse.e4.ui.css.swt.theme.source"/>
+<plugin id="org.eclipse.e4.ui.di"/>
+<plugin id="org.eclipse.e4.ui.di.source"/>
+<plugin id="org.eclipse.e4.ui.dialogs"/>
+<plugin id="org.eclipse.e4.ui.dialogs.source"/>
+<plugin id="org.eclipse.e4.ui.model.workbench"/>
+<plugin id="org.eclipse.e4.ui.model.workbench.source"/>
+<plugin id="org.eclipse.e4.ui.services"/>
+<plugin id="org.eclipse.e4.ui.services.source"/>
+<plugin id="org.eclipse.e4.ui.swt.gtk"/>
+<plugin id="org.eclipse.e4.ui.swt.gtk.source"/>
+<plugin id="org.eclipse.e4.ui.widgets"/>
+<plugin id="org.eclipse.e4.ui.widgets.source"/>
+<plugin id="org.eclipse.e4.ui.workbench"/>
+<plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
+<plugin id="org.eclipse.e4.ui.workbench.addons.swt.source"/>
+<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
+<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.source"/>
+<plugin id="org.eclipse.e4.ui.workbench.source"/>
+<plugin id="org.eclipse.e4.ui.workbench.swt"/>
+<plugin id="org.eclipse.e4.ui.workbench.swt.source"/>
+<plugin id="org.eclipse.e4.ui.workbench3"/>
+<plugin id="org.eclipse.e4.ui.workbench3.source"/>
+<plugin id="org.eclipse.emf"/>
+<plugin id="org.eclipse.emf.ant"/>
+<plugin id="org.eclipse.emf.ant.source"/>
+<plugin id="org.eclipse.emf.cdo"/>
+<plugin id="org.eclipse.emf.cdo.admin"/>
+<plugin id="org.eclipse.emf.cdo.admin.source"/>
+<plugin id="org.eclipse.emf.cdo.common"/>
+<plugin id="org.eclipse.emf.cdo.common.db"/>
+<plugin id="org.eclipse.emf.cdo.common.db.source"/>
+<plugin id="org.eclipse.emf.cdo.common.source"/>
+<plugin id="org.eclipse.emf.cdo.compare"/>
+<plugin id="org.eclipse.emf.cdo.compare.source"/>
+<plugin id="org.eclipse.emf.cdo.defs"/>
+<plugin id="org.eclipse.emf.cdo.defs.source"/>
+<plugin id="org.eclipse.emf.cdo.doc"/>
+<plugin id="org.eclipse.emf.cdo.doc.source"/>
+<plugin id="org.eclipse.emf.cdo.ecore.retrofit"/>
+<plugin id="org.eclipse.emf.cdo.ecore.retrofit.source"/>
+<plugin id="org.eclipse.emf.cdo.edit"/>
+<plugin id="org.eclipse.emf.cdo.edit.source"/>
+<plugin id="org.eclipse.emf.cdo.examples.installer"/>
+<plugin id="org.eclipse.emf.cdo.examples.installer.source"/>
+<plugin id="org.eclipse.emf.cdo.explorer"/>
+<plugin id="org.eclipse.emf.cdo.explorer.source"/>
+<plugin id="org.eclipse.emf.cdo.explorer.ui"/>
+<plugin id="org.eclipse.emf.cdo.explorer.ui.source"/>
+<plugin id="org.eclipse.emf.cdo.expressions"/>
+<plugin id="org.eclipse.emf.cdo.expressions.edit"/>
+<plugin id="org.eclipse.emf.cdo.expressions.edit.source"/>
+<plugin id="org.eclipse.emf.cdo.expressions.editor"/>
+<plugin id="org.eclipse.emf.cdo.expressions.editor.source"/>
+<plugin id="org.eclipse.emf.cdo.expressions.source"/>
+<plugin id="org.eclipse.emf.cdo.migrator"/>
+<plugin id="org.eclipse.emf.cdo.migrator.source"/>
+<plugin id="org.eclipse.emf.cdo.net4j"/>
+<plugin id="org.eclipse.emf.cdo.net4j.source"/>
+<plugin id="org.eclipse.emf.cdo.sdk"/>
+<plugin id="org.eclipse.emf.cdo.sdk.source"/>
+<plugin id="org.eclipse.emf.cdo.security"/>
+<plugin id="org.eclipse.emf.cdo.security.edit"/>
+<plugin id="org.eclipse.emf.cdo.security.edit.source"/>
+<plugin id="org.eclipse.emf.cdo.security.editor"/>
+<plugin id="org.eclipse.emf.cdo.security.editor.source"/>
+<plugin id="org.eclipse.emf.cdo.security.source"/>
+<plugin id="org.eclipse.emf.cdo.security.ui"/>
+<plugin id="org.eclipse.emf.cdo.security.ui.source"/>
+<plugin id="org.eclipse.emf.cdo.server"/>
+<plugin id="org.eclipse.emf.cdo.server.admin"/>
+<plugin id="org.eclipse.emf.cdo.server.admin.source"/>
+<plugin id="org.eclipse.emf.cdo.server.db"/>
+<plugin id="org.eclipse.emf.cdo.server.db.source"/>
+<plugin id="org.eclipse.emf.cdo.server.lissome"/>
+<plugin id="org.eclipse.emf.cdo.server.lissome.source"/>
+<plugin id="org.eclipse.emf.cdo.server.mongodb"/>
+<plugin id="org.eclipse.emf.cdo.server.mongodb.source"/>
+<plugin id="org.eclipse.emf.cdo.server.net4j"/>
+<plugin id="org.eclipse.emf.cdo.server.net4j.source"/>
+<plugin id="org.eclipse.emf.cdo.server.ocl"/>
+<plugin id="org.eclipse.emf.cdo.server.ocl.source"/>
+<plugin id="org.eclipse.emf.cdo.server.product"/>
+<plugin id="org.eclipse.emf.cdo.server.product.source"/>
+<plugin id="org.eclipse.emf.cdo.server.security"/>
+<plugin id="org.eclipse.emf.cdo.server.security.source"/>
+<plugin id="org.eclipse.emf.cdo.server.source"/>
+<plugin id="org.eclipse.emf.cdo.source"/>
+<plugin id="org.eclipse.emf.cdo.transfer"/>
+<plugin id="org.eclipse.emf.cdo.transfer.repository"/>
+<plugin id="org.eclipse.emf.cdo.transfer.repository.source"/>
+<plugin id="org.eclipse.emf.cdo.transfer.source"/>
+<plugin id="org.eclipse.emf.cdo.transfer.ui"/>
+<plugin id="org.eclipse.emf.cdo.transfer.ui.source"/>
+<plugin id="org.eclipse.emf.cdo.transfer.workspace"/>
+<plugin id="org.eclipse.emf.cdo.transfer.workspace.source"/>
+<plugin id="org.eclipse.emf.cdo.transfer.workspace.ui"/>
+<plugin id="org.eclipse.emf.cdo.transfer.workspace.ui.source"/>
+<plugin id="org.eclipse.emf.cdo.ui"/>
+<plugin id="org.eclipse.emf.cdo.ui.admin"/>
+<plugin id="org.eclipse.emf.cdo.ui.admin.source"/>
+<plugin id="org.eclipse.emf.cdo.ui.compare"/>
+<plugin id="org.eclipse.emf.cdo.ui.compare.source"/>
+<plugin id="org.eclipse.emf.cdo.ui.defs"/>
+<plugin id="org.eclipse.emf.cdo.ui.defs.source"/>
+<plugin id="org.eclipse.emf.cdo.ui.shared"/>
+<plugin id="org.eclipse.emf.cdo.ui.shared.source"/>
+<plugin id="org.eclipse.emf.cdo.ui.source"/>
+<plugin id="org.eclipse.emf.cdo.ui.team"/>
+<plugin id="org.eclipse.emf.cdo.ui.team.source"/>
+<plugin id="org.eclipse.emf.cdo.workspace"/>
+<plugin id="org.eclipse.emf.cdo.workspace.source"/>
+<plugin id="org.eclipse.emf.cheatsheets"/>
+<plugin id="org.eclipse.emf.cheatsheets.source"/>
+<plugin id="org.eclipse.emf.codegen"/>
+<plugin id="org.eclipse.emf.codegen.ecore"/>
+<plugin id="org.eclipse.emf.codegen.ecore.source"/>
+<plugin id="org.eclipse.emf.codegen.ecore.ui"/>
+<plugin id="org.eclipse.emf.codegen.ecore.ui.source"/>
+<plugin id="org.eclipse.emf.codegen.source"/>
+<plugin id="org.eclipse.emf.codegen.ui"/>
+<plugin id="org.eclipse.emf.codegen.ui.source"/>
+<plugin id="org.eclipse.emf.common"/>
+<plugin id="org.eclipse.emf.common.source"/>
+<plugin id="org.eclipse.emf.common.ui"/>
+<plugin id="org.eclipse.emf.common.ui.source"/>
+<plugin id="org.eclipse.emf.converter"/>
+<plugin id="org.eclipse.emf.converter.source"/>
+<plugin id="org.eclipse.emf.databinding"/>
+<plugin id="org.eclipse.emf.databinding.edit"/>
+<plugin id="org.eclipse.emf.databinding.edit.source"/>
+<plugin id="org.eclipse.emf.databinding.source"/>
+<plugin id="org.eclipse.emf.doc"/>
+<plugin id="org.eclipse.emf.ecore"/>
+<plugin id="org.eclipse.emf.ecore.change"/>
+<plugin id="org.eclipse.emf.ecore.change.edit"/>
+<plugin id="org.eclipse.emf.ecore.change.edit.source"/>
+<plugin id="org.eclipse.emf.ecore.change.source"/>
+<plugin id="org.eclipse.emf.ecore.edit"/>
+<plugin id="org.eclipse.emf.ecore.edit.source"/>
+<plugin id="org.eclipse.emf.ecore.editor"/>
+<plugin id="org.eclipse.emf.ecore.editor.source"/>
+<plugin id="org.eclipse.emf.ecore.source"/>
+<plugin id="org.eclipse.emf.ecore.xmi"/>
+<plugin id="org.eclipse.emf.ecore.xmi.source"/>
+<plugin id="org.eclipse.emf.edapt.common"/>
+<plugin id="org.eclipse.emf.edapt.common.source"/>
+<plugin id="org.eclipse.emf.edapt.declaration"/>
+<plugin id="org.eclipse.emf.edapt.declaration.source"/>
+<plugin id="org.eclipse.emf.edapt.history"/>
+<plugin id="org.eclipse.emf.edapt.history.source"/>
+<plugin id="org.eclipse.emf.edapt.migration"/>
+<plugin id="org.eclipse.emf.edapt.migration.source"/>
+<plugin id="org.eclipse.emf.edit"/>
+<plugin id="org.eclipse.emf.edit.source"/>
+<plugin id="org.eclipse.emf.edit.ui"/>
+<plugin id="org.eclipse.emf.edit.ui.source"/>
+<plugin id="org.eclipse.emf.emfstore.client"/>
+<plugin id="org.eclipse.emf.emfstore.client.model.edit"/>
+<plugin id="org.eclipse.emf.emfstore.client.model.edit.source"/>
+<plugin id="org.eclipse.emf.emfstore.client.source"/>
+<plugin id="org.eclipse.emf.emfstore.client.transaction"/>
+<plugin id="org.eclipse.emf.emfstore.client.ui"/>
+<plugin id="org.eclipse.emf.emfstore.client.ui.rcp"/>
+<plugin id="org.eclipse.emf.emfstore.client.ui.rcp.source"/>
+<plugin id="org.eclipse.emf.emfstore.client.ui.source"/>
+<plugin id="org.eclipse.emf.emfstore.client.ui.transaction"/>
+<plugin id="org.eclipse.emf.emfstore.common"/>
+<plugin id="org.eclipse.emf.emfstore.common.model"/>
+<plugin id="org.eclipse.emf.emfstore.common.model.edit"/>
+<plugin id="org.eclipse.emf.emfstore.common.model.edit.source"/>
+<plugin id="org.eclipse.emf.emfstore.common.model.source"/>
+<plugin id="org.eclipse.emf.emfstore.common.source"/>
+<plugin id="org.eclipse.emf.emfstore.ecore"/>
+<plugin id="org.eclipse.emf.emfstore.ecore.source"/>
+<plugin id="org.eclipse.emf.emfstore.example.installer"/>
+<plugin id="org.eclipse.emf.emfstore.examplemodel"/>
+<plugin id="org.eclipse.emf.emfstore.examplemodel.edit"/>
+<plugin id="org.eclipse.emf.emfstore.examplemodel.edit.source"/>
+<plugin id="org.eclipse.emf.emfstore.examplemodel.source"/>
+<plugin id="org.eclipse.emf.emfstore.migration"/>
+<plugin id="org.eclipse.emf.emfstore.migration.source"/>
+<plugin id="org.eclipse.emf.emfstore.server"/>
+<plugin id="org.eclipse.emf.emfstore.server.model"/>
+<plugin id="org.eclipse.emf.emfstore.server.model.edit"/>
+<plugin id="org.eclipse.emf.emfstore.server.model.edit.source"/>
+<plugin id="org.eclipse.emf.emfstore.server.model.source"/>
+<plugin id="org.eclipse.emf.emfstore.server.source"/>
+<plugin id="org.eclipse.emf.example.installer"/>
+<plugin id="org.eclipse.emf.exporter"/>
+<plugin id="org.eclipse.emf.exporter.source"/>
+<plugin id="org.eclipse.emf.importer"/>
+<plugin id="org.eclipse.emf.importer.ecore"/>
+<plugin id="org.eclipse.emf.importer.ecore.source"/>
+<plugin id="org.eclipse.emf.importer.java"/>
+<plugin id="org.eclipse.emf.importer.java.source"/>
+<plugin id="org.eclipse.emf.importer.rose"/>
+<plugin id="org.eclipse.emf.importer.rose.source"/>
+<plugin id="org.eclipse.emf.importer.source"/>
+<plugin id="org.eclipse.emf.mapping"/>
+<plugin id="org.eclipse.emf.mapping.ecore"/>
+<plugin id="org.eclipse.emf.mapping.ecore.editor"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore.editor"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore.editor.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore2ecore.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml.source"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml.ui"/>
+<plugin id="org.eclipse.emf.mapping.ecore2xml.ui.source"/>
+<plugin id="org.eclipse.emf.mapping.source"/>
+<plugin id="org.eclipse.emf.mapping.ui"/>
+<plugin id="org.eclipse.emf.mapping.ui.source"/>
+<plugin id="org.eclipse.emf.transaction"/>
+<plugin id="org.eclipse.emf.transaction.doc"/>
+<plugin id="org.eclipse.emf.transaction.examples"/>
+<plugin id="org.eclipse.emf.transaction.source"/>
+<plugin id="org.eclipse.emf.transaction.ui"/>
+<plugin id="org.eclipse.emf.transaction.ui.source"/>
+<plugin id="org.eclipse.emf.validation"/>
+<plugin id="org.eclipse.emf.validation.doc"/>
+<plugin id="org.eclipse.emf.validation.examples"/>
+<plugin id="org.eclipse.emf.validation.ocl"/>
+<plugin id="org.eclipse.emf.validation.ocl.source"/>
+<plugin id="org.eclipse.emf.validation.source"/>
+<plugin id="org.eclipse.emf.validation.ui"/>
+<plugin id="org.eclipse.emf.validation.ui.ide"/>
+<plugin id="org.eclipse.emf.validation.ui.ide.source"/>
+<plugin id="org.eclipse.emf.validation.ui.source"/>
+<plugin id="org.eclipse.emf.workspace"/>
+<plugin id="org.eclipse.emf.workspace.doc"/>
+<plugin id="org.eclipse.emf.workspace.source"/>
+<plugin id="org.eclipse.emf.workspace.ui"/>
+<plugin id="org.eclipse.emf.workspace.ui.source"/>
+<plugin id="org.eclipse.equinox.app"/>
+<plugin id="org.eclipse.equinox.app.source"/>
+<plugin id="org.eclipse.equinox.bidi"/>
+<plugin id="org.eclipse.equinox.bidi.source"/>
+<plugin id="org.eclipse.equinox.cm"/>
+<plugin id="org.eclipse.equinox.cm.source"/>
+<plugin id="org.eclipse.equinox.common"/>
+<plugin id="org.eclipse.equinox.common.source"/>
+<plugin id="org.eclipse.equinox.concurrent"/>
+<plugin id="org.eclipse.equinox.concurrent.source"/>
+<plugin id="org.eclipse.equinox.console"/>
+<plugin id="org.eclipse.equinox.console.jaas.fragment"/>
+<plugin id="org.eclipse.equinox.console.source"/>
+<plugin id="org.eclipse.equinox.console.ssh"/>
+<plugin id="org.eclipse.equinox.console.ssh.source"/>
+<plugin id="org.eclipse.equinox.coordinator"/>
+<plugin id="org.eclipse.equinox.coordinator.source"/>
+<plugin id="org.eclipse.equinox.device"/>
+<plugin id="org.eclipse.equinox.device.source"/>
+<plugin id="org.eclipse.equinox.ds"/>
+<plugin id="org.eclipse.equinox.ds.source"/>
+<plugin id="org.eclipse.equinox.event"/>
+<plugin id="org.eclipse.equinox.event.source"/>
+<plugin id="org.eclipse.equinox.frameworkadmin"/>
+<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
+<plugin id="org.eclipse.equinox.frameworkadmin.equinox.source"/>
+<plugin id="org.eclipse.equinox.frameworkadmin.source"/>
+<plugin id="org.eclipse.equinox.http.jetty"/>
+<plugin id="org.eclipse.equinox.http.jetty.source"/>
+<plugin id="org.eclipse.equinox.http.registry"/>
+<plugin id="org.eclipse.equinox.http.registry.source"/>
+<plugin id="org.eclipse.equinox.http.servlet"/>
+<plugin id="org.eclipse.equinox.http.servlet.source"/>
+<plugin id="org.eclipse.equinox.http.servletbridge"/>
+<plugin id="org.eclipse.equinox.http.servletbridge.source"/>
+<plugin id="org.eclipse.equinox.io"/>
+<plugin id="org.eclipse.equinox.io.source"/>
+<plugin id="org.eclipse.equinox.ip"/>
+<plugin id="org.eclipse.equinox.ip.source"/>
+<plugin id="org.eclipse.equinox.jsp.jasper"/>
+<plugin id="org.eclipse.equinox.jsp.jasper.registry"/>
+<plugin id="org.eclipse.equinox.jsp.jasper.registry.source"/>
+<plugin id="org.eclipse.equinox.jsp.jasper.source"/>
+<plugin id="org.eclipse.equinox.launcher"/>
+<plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64"/>
+<plugin id="org.eclipse.equinox.launcher.source"/>
+<plugin id="org.eclipse.equinox.metatype"/>
+<plugin id="org.eclipse.equinox.metatype.source"/>
+<plugin id="org.eclipse.equinox.p2.artifact.repository"/>
+<plugin id="org.eclipse.equinox.p2.artifact.repository.source"/>
+<plugin id="org.eclipse.equinox.p2.console"/>
+<plugin id="org.eclipse.equinox.p2.console.source"/>
+<plugin id="org.eclipse.equinox.p2.core"/>
+<plugin id="org.eclipse.equinox.p2.core.source"/>
+<plugin id="org.eclipse.equinox.p2.director"/>
+<plugin id="org.eclipse.equinox.p2.director.app"/>
+<plugin id="org.eclipse.equinox.p2.director.app.source"/>
+<plugin id="org.eclipse.equinox.p2.director.source"/>
+<plugin id="org.eclipse.equinox.p2.directorywatcher"/>
+<plugin id="org.eclipse.equinox.p2.directorywatcher.source"/>
+<plugin id="org.eclipse.equinox.p2.engine"/>
+<plugin id="org.eclipse.equinox.p2.engine.source"/>
+<plugin id="org.eclipse.equinox.p2.extensionlocation"/>
+<plugin id="org.eclipse.equinox.p2.extensionlocation.source"/>
+<plugin id="org.eclipse.equinox.p2.garbagecollector"/>
+<plugin id="org.eclipse.equinox.p2.garbagecollector.source"/>
+<plugin id="org.eclipse.equinox.p2.jarprocessor"/>
+<plugin id="org.eclipse.equinox.p2.jarprocessor.source"/>
+<plugin id="org.eclipse.equinox.p2.metadata"/>
+<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
+<plugin id="org.eclipse.equinox.p2.metadata.repository.source"/>
+<plugin id="org.eclipse.equinox.p2.metadata.source"/>
+<plugin id="org.eclipse.equinox.p2.operations"/>
+<plugin id="org.eclipse.equinox.p2.operations.source"/>
+<plugin id="org.eclipse.equinox.p2.publisher"/>
+<plugin id="org.eclipse.equinox.p2.publisher.eclipse"/>
+<plugin id="org.eclipse.equinox.p2.publisher.eclipse.source"/>
+<plugin id="org.eclipse.equinox.p2.publisher.source"/>
+<plugin id="org.eclipse.equinox.p2.reconciler.dropins"/>
+<plugin id="org.eclipse.equinox.p2.reconciler.dropins.source"/>
+<plugin id="org.eclipse.equinox.p2.repository"/>
+<plugin id="org.eclipse.equinox.p2.repository.source"/>
+<plugin id="org.eclipse.equinox.p2.repository.tools"/>
+<plugin id="org.eclipse.equinox.p2.repository.tools.source"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse.source"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
+<plugin id="org.eclipse.equinox.p2.touchpoint.natives.source"/>
+<plugin id="org.eclipse.equinox.p2.transport.ecf"/>
+<plugin id="org.eclipse.equinox.p2.transport.ecf.source"/>
+<plugin id="org.eclipse.equinox.p2.ui"/>
+<plugin id="org.eclipse.equinox.p2.ui.importexport"/>
+<plugin id="org.eclipse.equinox.p2.ui.importexport.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.sdk.source"/>
+<plugin id="org.eclipse.equinox.p2.ui.source"/>
+<plugin id="org.eclipse.equinox.p2.updatechecker"/>
+<plugin id="org.eclipse.equinox.p2.updatechecker.source"/>
+<plugin id="org.eclipse.equinox.p2.updatesite"/>
+<plugin id="org.eclipse.equinox.p2.updatesite.source"/>
+<plugin id="org.eclipse.equinox.preferences"/>
+<plugin id="org.eclipse.equinox.preferences.source"/>
+<plugin id="org.eclipse.equinox.region"/>
+<plugin id="org.eclipse.equinox.region.source"/>
+<plugin id="org.eclipse.equinox.registry"/>
+<plugin id="org.eclipse.equinox.registry.source"/>
+<plugin id="org.eclipse.equinox.security"/>
+<plugin id="org.eclipse.equinox.security.source"/>
+<plugin id="org.eclipse.equinox.security.ui"/>
+<plugin id="org.eclipse.equinox.security.ui.source"/>
+<plugin id="org.eclipse.equinox.servletbridge"/>
+<plugin id="org.eclipse.equinox.servletbridge.source"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator.manipulator.source"/>
+<plugin id="org.eclipse.equinox.simpleconfigurator.source"/>
+<plugin id="org.eclipse.equinox.supplement"/>
+<plugin id="org.eclipse.equinox.supplement.source"/>
+<plugin id="org.eclipse.equinox.transforms.hook"/>
+<plugin id="org.eclipse.equinox.transforms.hook.source"/>
+<plugin id="org.eclipse.equinox.transforms.xslt"/>
+<plugin id="org.eclipse.equinox.transforms.xslt.source"/>
+<plugin id="org.eclipse.equinox.useradmin"/>
+<plugin id="org.eclipse.equinox.useradmin.source"/>
+<plugin id="org.eclipse.equinox.util"/>
+<plugin id="org.eclipse.equinox.util.source"/>
+<plugin id="org.eclipse.equinox.weaving.caching"/>
+<plugin id="org.eclipse.equinox.weaving.caching.j9"/>
+<plugin id="org.eclipse.equinox.weaving.caching.j9.source"/>
+<plugin id="org.eclipse.equinox.weaving.caching.source"/>
+<plugin id="org.eclipse.equinox.weaving.hook"/>
+<plugin id="org.eclipse.equinox.weaving.hook.source"/>
+<plugin id="org.eclipse.equinox.wireadmin"/>
+<plugin id="org.eclipse.equinox.wireadmin.source"/>
+<plugin id="org.eclipse.gef"/>
+<plugin id="org.eclipse.gef.doc.isv"/>
+<plugin id="org.eclipse.gef.examples.ui.pde"/>
+<plugin id="org.eclipse.gef.source"/>
+<plugin id="org.eclipse.graphiti"/>
+<plugin id="org.eclipse.graphiti.export.batik"/>
+<plugin id="org.eclipse.graphiti.mm"/>
+<plugin id="org.eclipse.graphiti.mm.source"/>
+<plugin id="org.eclipse.graphiti.pattern"/>
+<plugin id="org.eclipse.graphiti.pattern.source"/>
+<plugin id="org.eclipse.graphiti.source"/>
+<plugin id="org.eclipse.graphiti.ui"/>
+<plugin id="org.eclipse.graphiti.ui.source"/>
+<plugin id="org.eclipse.help"/>
+<plugin id="org.eclipse.help.base"/>
+<plugin id="org.eclipse.help.base.source"/>
+<plugin id="org.eclipse.help.source"/>
+<plugin id="org.eclipse.help.ui"/>
+<plugin id="org.eclipse.help.ui.source"/>
+<plugin id="org.eclipse.help.webapp"/>
+<plugin id="org.eclipse.help.webapp.source"/>
+<plugin id="org.eclipse.jdt"/>
+<plugin id="org.eclipse.jdt.annotation" version="2.1.0.v20160418-1457"/>
+<plugin id="org.eclipse.jdt.annotation" version="1.1.100.v20160418-1457"/>
+<plugin id="org.eclipse.jdt.annotation.source" version="2.1.0.v20160418-1457"/>
+<plugin id="org.eclipse.jdt.annotation.source" version="1.1.100.v20160418-1457"/>
+<plugin id="org.eclipse.jdt.apt.core"/>
+<plugin id="org.eclipse.jdt.apt.core.source"/>
+<plugin id="org.eclipse.jdt.apt.pluggable.core"/>
+<plugin id="org.eclipse.jdt.apt.pluggable.core.source"/>
+<plugin id="org.eclipse.jdt.apt.ui"/>
+<plugin id="org.eclipse.jdt.apt.ui.source"/>
+<plugin id="org.eclipse.jdt.compiler.apt"/>
+<plugin id="org.eclipse.jdt.compiler.apt.source"/>
+<plugin id="org.eclipse.jdt.compiler.tool"/>
+<plugin id="org.eclipse.jdt.compiler.tool.source"/>
+<plugin id="org.eclipse.jdt.core"/>
+<plugin id="org.eclipse.jdt.core.manipulation"/>
+<plugin id="org.eclipse.jdt.core.manipulation.source"/>
+<plugin id="org.eclipse.jdt.core.source"/>
+<plugin id="org.eclipse.jdt.debug"/>
+<plugin id="org.eclipse.jdt.debug.source"/>
+<plugin id="org.eclipse.jdt.debug.ui"/>
+<plugin id="org.eclipse.jdt.debug.ui.source"/>
+<plugin id="org.eclipse.jdt.doc.user"/>
+<plugin id="org.eclipse.jdt.junit"/>
+<plugin id="org.eclipse.jdt.junit.core"/>
+<plugin id="org.eclipse.jdt.junit.core.source"/>
+<plugin id="org.eclipse.jdt.junit.runtime"/>
+<plugin id="org.eclipse.jdt.junit.runtime.source"/>
+<plugin id="org.eclipse.jdt.junit.source"/>
+<plugin id="org.eclipse.jdt.junit4.runtime"/>
+<plugin id="org.eclipse.jdt.junit4.runtime.source"/>
+<plugin id="org.eclipse.jdt.launching"/>
+<plugin id="org.eclipse.jdt.launching.source"/>
+<plugin id="org.eclipse.jdt.ui"/>
+<plugin id="org.eclipse.jdt.ui.source"/>
+<plugin id="org.eclipse.jetty.continuation"/>
+<plugin id="org.eclipse.jetty.continuation.source"/>
+<plugin id="org.eclipse.jetty.http"/>
+<plugin id="org.eclipse.jetty.http.source"/>
+<plugin id="org.eclipse.jetty.io"/>
+<plugin id="org.eclipse.jetty.io.source"/>
+<plugin id="org.eclipse.jetty.security"/>
+<plugin id="org.eclipse.jetty.security.source"/>
+<plugin id="org.eclipse.jetty.server"/>
+<plugin id="org.eclipse.jetty.server.source"/>
+<plugin id="org.eclipse.jetty.servlet"/>
+<plugin id="org.eclipse.jetty.servlet.source"/>
+<plugin id="org.eclipse.jetty.util"/>
+<plugin id="org.eclipse.jetty.util.source"/>
+<plugin id="org.eclipse.jface"/>
+<plugin id="org.eclipse.jface.databinding"/>
+<plugin id="org.eclipse.jface.databinding.source"/>
+<plugin id="org.eclipse.jface.source"/>
+<plugin id="org.eclipse.jface.text"/>
+<plugin id="org.eclipse.jface.text.source"/>
+<plugin id="org.eclipse.jsch.core"/>
+<plugin id="org.eclipse.jsch.core.source"/>
+<plugin id="org.eclipse.jsch.ui"/>
+<plugin id="org.eclipse.jsch.ui.source"/>
+<plugin id="org.eclipse.ltk.core.refactoring"/>
+<plugin id="org.eclipse.ltk.core.refactoring.source"/>
+<plugin id="org.eclipse.ltk.ui.refactoring"/>
+<plugin id="org.eclipse.ltk.ui.refactoring.source"/>
+<plugin id="org.eclipse.nebula.widgets.grid"/>
+<plugin id="org.eclipse.nebula.widgets.grid.source"/>
+<plugin id="org.eclipse.net4j"/>
+<plugin id="org.eclipse.net4j.db"/>
+<plugin id="org.eclipse.net4j.db.doc"/>
+<plugin id="org.eclipse.net4j.db.doc.source"/>
+<plugin id="org.eclipse.net4j.db.h2"/>
+<plugin id="org.eclipse.net4j.db.h2.source"/>
+<plugin id="org.eclipse.net4j.db.jdbc"/>
+<plugin id="org.eclipse.net4j.db.jdbc.source"/>
+<plugin id="org.eclipse.net4j.db.source"/>
+<plugin id="org.eclipse.net4j.debug"/>
+<plugin id="org.eclipse.net4j.debug.source"/>
+<plugin id="org.eclipse.net4j.defs"/>
+<plugin id="org.eclipse.net4j.defs.source"/>
+<plugin id="org.eclipse.net4j.doc"/>
+<plugin id="org.eclipse.net4j.doc.source"/>
+<plugin id="org.eclipse.net4j.examples.installer"/>
+<plugin id="org.eclipse.net4j.examples.installer.source"/>
+<plugin id="org.eclipse.net4j.http"/>
+<plugin id="org.eclipse.net4j.http.common"/>
+<plugin id="org.eclipse.net4j.http.common.source"/>
+<plugin id="org.eclipse.net4j.http.server"/>
+<plugin id="org.eclipse.net4j.http.server.source"/>
+<plugin id="org.eclipse.net4j.http.source"/>
+<plugin id="org.eclipse.net4j.jvm"/>
+<plugin id="org.eclipse.net4j.jvm.source"/>
+<plugin id="org.eclipse.net4j.sdk"/>
+<plugin id="org.eclipse.net4j.sdk.source"/>
+<plugin id="org.eclipse.net4j.source"/>
+<plugin id="org.eclipse.net4j.tcp"/>
+<plugin id="org.eclipse.net4j.tcp.source"/>
+<plugin id="org.eclipse.net4j.ui"/>
+<plugin id="org.eclipse.net4j.ui.defs"/>
+<plugin id="org.eclipse.net4j.ui.defs.source"/>
+<plugin id="org.eclipse.net4j.ui.shared"/>
+<plugin id="org.eclipse.net4j.ui.shared.source"/>
+<plugin id="org.eclipse.net4j.ui.source"/>
+<plugin id="org.eclipse.net4j.util"/>
+<plugin id="org.eclipse.net4j.util.defs"/>
+<plugin id="org.eclipse.net4j.util.defs.source"/>
+<plugin id="org.eclipse.net4j.util.doc"/>
+<plugin id="org.eclipse.net4j.util.doc.source"/>
+<plugin id="org.eclipse.net4j.util.source"/>
+<plugin id="org.eclipse.net4j.util.ui"/>
+<plugin id="org.eclipse.net4j.util.ui.source"/>
+<plugin id="org.eclipse.ocl"/>
+<plugin id="org.eclipse.ocl.common"/>
+<plugin id="org.eclipse.ocl.common.source"/>
+<plugin id="org.eclipse.ocl.common.ui"/>
+<plugin id="org.eclipse.ocl.common.ui.source"/>
+<plugin id="org.eclipse.ocl.doc"/>
+<plugin id="org.eclipse.ocl.doc.source"/>
+<plugin id="org.eclipse.ocl.ecore"/>
+<plugin id="org.eclipse.ocl.ecore.edit"/>
+<plugin id="org.eclipse.ocl.ecore.edit.source"/>
+<plugin id="org.eclipse.ocl.ecore.source"/>
+<plugin id="org.eclipse.ocl.edit"/>
+<plugin id="org.eclipse.ocl.edit.source"/>
+<plugin id="org.eclipse.ocl.source"/>
+<plugin id="org.eclipse.ocl.ui"/>
+<plugin id="org.eclipse.ocl.ui.source"/>
+<plugin id="org.eclipse.ocl.uml"/>
+<plugin id="org.eclipse.ocl.uml.edit"/>
+<plugin id="org.eclipse.ocl.uml.edit.source"/>
+<plugin id="org.eclipse.ocl.uml.source"/>
+<plugin id="org.eclipse.ocl.uml.ui"/>
+<plugin id="org.eclipse.ocl.uml.ui.source"/>
+<plugin id="org.eclipse.orbit.mongodb"/>
+<plugin id="org.eclipse.orbit.mongodb.source"/>
+<plugin id="org.eclipse.osgi"/>
+<plugin id="org.eclipse.osgi.compatibility.state"/>
+<plugin id="org.eclipse.osgi.compatibility.state.source"/>
+<plugin id="org.eclipse.osgi.services"/>
+<plugin id="org.eclipse.osgi.services.source"/>
+<plugin id="org.eclipse.osgi.source"/>
+<plugin id="org.eclipse.osgi.util"/>
+<plugin id="org.eclipse.osgi.util.source"/>
+<plugin id="org.eclipse.pde"/>
+<plugin id="org.eclipse.pde.api.tools"/>
+<plugin id="org.eclipse.pde.api.tools.annotations"/>
+<plugin id="org.eclipse.pde.api.tools.annotations.source"/>
+<plugin id="org.eclipse.pde.api.tools.source"/>
+<plugin id="org.eclipse.pde.api.tools.ui"/>
+<plugin id="org.eclipse.pde.api.tools.ui.source"/>
+<plugin id="org.eclipse.pde.build"/>
+<plugin id="org.eclipse.pde.build.source"/>
+<plugin id="org.eclipse.pde.core"/>
+<plugin id="org.eclipse.pde.core.source"/>
+<plugin id="org.eclipse.pde.doc.user"/>
+<plugin id="org.eclipse.pde.ds.annotations"/>
+<plugin id="org.eclipse.pde.ds.annotations.source"/>
+<plugin id="org.eclipse.pde.ds.core"/>
+<plugin id="org.eclipse.pde.ds.core.source"/>
+<plugin id="org.eclipse.pde.ds.ui"/>
+<plugin id="org.eclipse.pde.ds.ui.source"/>
+<plugin id="org.eclipse.pde.junit.runtime"/>
+<plugin id="org.eclipse.pde.junit.runtime.source"/>
+<plugin id="org.eclipse.pde.launching"/>
+<plugin id="org.eclipse.pde.launching.source"/>
+<plugin id="org.eclipse.pde.runtime"/>
+<plugin id="org.eclipse.pde.runtime.source"/>
+<plugin id="org.eclipse.pde.ua.core"/>
+<plugin id="org.eclipse.pde.ua.core.source"/>
+<plugin id="org.eclipse.pde.ua.ui"/>
+<plugin id="org.eclipse.pde.ua.ui.source"/>
+<plugin id="org.eclipse.pde.ui"/>
+<plugin id="org.eclipse.pde.ui.source"/>
+<plugin id="org.eclipse.pde.ui.templates"/>
+<plugin id="org.eclipse.pde.ui.templates.source"/>
+<plugin id="org.eclipse.platform"/>
+<plugin id="org.eclipse.platform.doc.user"/>
+<plugin id="org.eclipse.platform.source"/>
+<plugin id="org.eclipse.rcp"/>
+<plugin id="org.eclipse.search"/>
+<plugin id="org.eclipse.search.source"/>
+<plugin id="org.eclipse.swt"/>
+<plugin id="org.eclipse.swt.gtk.linux.x86_64"/>
+<plugin id="org.eclipse.swt.gtk.linux.x86_64.source"/>
+<plugin id="org.eclipse.swtbot.ant.junit"/>
+<plugin id="org.eclipse.swtbot.e4.finder"/>
+<plugin id="org.eclipse.swtbot.e4.finder.source"/>
+<plugin id="org.eclipse.swtbot.eclipse.core"/>
+<plugin id="org.eclipse.swtbot.eclipse.core.source"/>
+<plugin id="org.eclipse.swtbot.eclipse.finder"/>
+<plugin id="org.eclipse.swtbot.eclipse.finder.source"/>
+<plugin id="org.eclipse.swtbot.eclipse.gef.finder"/>
+<plugin id="org.eclipse.swtbot.eclipse.gef.finder.source"/>
+<plugin id="org.eclipse.swtbot.eclipse.junit.headless"/>
+<plugin id="org.eclipse.swtbot.forms.finder"/>
+<plugin id="org.eclipse.swtbot.forms.finder.source"/>
+<plugin id="org.eclipse.swtbot.go"/>
+<plugin id="org.eclipse.swtbot.go.source"/>
+<plugin id="org.eclipse.swtbot.junit4_x"/>
+<plugin id="org.eclipse.swtbot.junit4_x.source"/>
+<plugin id="org.eclipse.swtbot.swt.finder"/>
+<plugin id="org.eclipse.swtbot.swt.finder.source"/>
+<plugin id="org.eclipse.team.core"/>
+<plugin id="org.eclipse.team.core.source"/>
+<plugin id="org.eclipse.team.ui"/>
+<plugin id="org.eclipse.team.ui.source"/>
+<plugin id="org.eclipse.text"/>
+<plugin id="org.eclipse.text.source"/>
+<plugin id="org.eclipse.ui"/>
+<plugin id="org.eclipse.ui.browser"/>
+<plugin id="org.eclipse.ui.browser.source"/>
+<plugin id="org.eclipse.ui.cheatsheets"/>
+<plugin id="org.eclipse.ui.cheatsheets.source"/>
+<plugin id="org.eclipse.ui.console"/>
+<plugin id="org.eclipse.ui.console.source"/>
+<plugin id="org.eclipse.ui.editors"/>
+<plugin id="org.eclipse.ui.editors.source"/>
+<plugin id="org.eclipse.ui.externaltools"/>
+<plugin id="org.eclipse.ui.externaltools.source"/>
+<plugin id="org.eclipse.ui.forms"/>
+<plugin id="org.eclipse.ui.forms.source"/>
+<plugin id="org.eclipse.ui.ide"/>
+<plugin id="org.eclipse.ui.ide.application"/>
+<plugin id="org.eclipse.ui.ide.application.source"/>
+<plugin id="org.eclipse.ui.ide.source"/>
+<plugin id="org.eclipse.ui.intro"/>
+<plugin id="org.eclipse.ui.intro.quicklinks"/>
+<plugin id="org.eclipse.ui.intro.quicklinks.source"/>
+<plugin id="org.eclipse.ui.intro.source"/>
+<plugin id="org.eclipse.ui.intro.universal"/>
+<plugin id="org.eclipse.ui.intro.universal.source"/>
+<plugin id="org.eclipse.ui.monitoring"/>
+<plugin id="org.eclipse.ui.monitoring.source"/>
+<plugin id="org.eclipse.ui.navigator"/>
+<plugin id="org.eclipse.ui.navigator.resources"/>
+<plugin id="org.eclipse.ui.navigator.resources.source"/>
+<plugin id="org.eclipse.ui.navigator.source"/>
+<plugin id="org.eclipse.ui.net"/>
+<plugin id="org.eclipse.ui.net.source"/>
+<plugin id="org.eclipse.ui.source"/>
+<plugin id="org.eclipse.ui.themes"/>
+<plugin id="org.eclipse.ui.themes.source"/>
+<plugin id="org.eclipse.ui.trace"/>
+<plugin id="org.eclipse.ui.trace.source"/>
+<plugin id="org.eclipse.ui.views"/>
+<plugin id="org.eclipse.ui.views.log"/>
+<plugin id="org.eclipse.ui.views.log.source"/>
+<plugin id="org.eclipse.ui.views.properties.tabbed"/>
+<plugin id="org.eclipse.ui.views.properties.tabbed.source"/>
+<plugin id="org.eclipse.ui.views.source"/>
+<plugin id="org.eclipse.ui.workbench"/>
+<plugin id="org.eclipse.ui.workbench.source"/>
+<plugin id="org.eclipse.ui.workbench.texteditor"/>
+<plugin id="org.eclipse.ui.workbench.texteditor.source"/>
+<plugin id="org.eclipse.update.configurator"/>
+<plugin id="org.eclipse.update.configurator.source"/>
+<plugin id="org.eclipse.xtend.core"/>
+<plugin id="org.eclipse.xtend.core.source"/>
+<plugin id="org.eclipse.xtend.doc"/>
+<plugin id="org.eclipse.xtend.examples"/>
+<plugin id="org.eclipse.xtend.ide"/>
+<plugin id="org.eclipse.xtend.ide.common"/>
+<plugin id="org.eclipse.xtend.ide.common.source"/>
+<plugin id="org.eclipse.xtend.ide.source"/>
+<plugin id="org.eclipse.xtend.lib"/>
+<plugin id="org.eclipse.xtend.lib.macro"/>
+<plugin id="org.eclipse.xtend.lib.macro.source"/>
+<plugin id="org.eclipse.xtend.lib.source"/>
+<plugin id="org.eclipse.xtend.m2e"/>
+<plugin id="org.eclipse.xtend.standalone"/>
+<plugin id="org.eclipse.xtend.standalone.source"/>
+<plugin id="org.eclipse.xtend2.lib"/>
+<plugin id="org.eclipse.xtend2.lib.source"/>
+<plugin id="org.eclipse.xtext"/>
+<plugin id="org.eclipse.xtext.builder"/>
+<plugin id="org.eclipse.xtext.builder.source"/>
+<plugin id="org.eclipse.xtext.builder.standalone"/>
+<plugin id="org.eclipse.xtext.builder.standalone.source"/>
+<plugin id="org.eclipse.xtext.common.types"/>
+<plugin id="org.eclipse.xtext.common.types.edit"/>
+<plugin id="org.eclipse.xtext.common.types.edit.source"/>
+<plugin id="org.eclipse.xtext.common.types.shared"/>
+<plugin id="org.eclipse.xtext.common.types.shared.jdt38"/>
+<plugin id="org.eclipse.xtext.common.types.shared.jdt38.source"/>
+<plugin id="org.eclipse.xtext.common.types.shared.source"/>
+<plugin id="org.eclipse.xtext.common.types.source"/>
+<plugin id="org.eclipse.xtext.common.types.ui"/>
+<plugin id="org.eclipse.xtext.common.types.ui.source"/>
+<plugin id="org.eclipse.xtext.ecore"/>
+<plugin id="org.eclipse.xtext.ecore.source"/>
+<plugin id="org.eclipse.xtext.generator"/>
+<plugin id="org.eclipse.xtext.generator.source"/>
+<plugin id="org.eclipse.xtext.ide"/>
+<plugin id="org.eclipse.xtext.java"/>
+<plugin id="org.eclipse.xtext.java.source"/>
+<plugin id="org.eclipse.xtext.logging"/>
+<plugin id="org.eclipse.xtext.logging.source"/>
+<plugin id="org.eclipse.xtext.smap"/>
+<plugin id="org.eclipse.xtext.smap.source"/>
+<plugin id="org.eclipse.xtext.source"/>
+<plugin id="org.eclipse.xtext.ui"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.source"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui.source"/>
+<plugin id="org.eclipse.xtext.ui.ecore"/>
+<plugin id="org.eclipse.xtext.ui.ecore.source"/>
+<plugin id="org.eclipse.xtext.ui.shared"/>
+<plugin id="org.eclipse.xtext.ui.shared.source"/>
+<plugin id="org.eclipse.xtext.ui.source"/>
+<plugin id="org.eclipse.xtext.util"/>
+<plugin id="org.eclipse.xtext.util.source"/>
+<plugin id="org.eclipse.xtext.xbase.lib"/>
+<plugin id="org.eclipse.xtext.xbase.lib.source"/>
+<plugin id="org.eclipse.xtext.xtext.generator"/>
+<plugin id="org.eclipse.xtext.xtext.generator.source"/>
+<plugin id="org.eclipse.xtext.xtext.wizard"/>
+<plugin id="org.eclipse.xtext.xtext.wizard.source"/>
+<plugin id="org.h2" version="1.3.168.v201212121212"/>
+<plugin id="org.h2" version="1.3.168.v201212121212"/>
+<plugin id="org.h2.source" version="1.3.168.v201212121212"/>
+<plugin id="org.h2.source" version="1.3.168.v201212121212"/>
+<plugin id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<plugin id="org.hamcrest.core" version="1.3.0.v201303031735"/>
+<plugin id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
+<plugin id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
+<plugin id="org.hamcrest.library"/>
+<plugin id="org.hamcrest.library.source"/>
+<plugin id="org.junit"/>
+<plugin id="org.junit.source"/>
+<plugin id="org.mockito.mockito-core-hamcrest-modified"/>
+<plugin id="org.objectweb.asm"/>
+<plugin id="org.objectweb.asm.source"/>
+<plugin id="org.objectweb.asm.tree"/>
+<plugin id="org.objectweb.asm.tree.source"/>
+<plugin id="org.objenesis"/>
+<plugin id="org.objenesis.source"/>
+<plugin id="org.sat4j.core"/>
+<plugin id="org.sat4j.pb"/>
+<plugin id="org.slf4j.api"/>
+<plugin id="org.slf4j.api.source"/>
+<plugin id="org.tukaani.xz"/>
+<plugin id="org.tukaani.xz.source"/>
+<plugin id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
+<plugin id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
+<plugin id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
+<plugin id="org.w3c.css.sac.source" version="1.3.1.v200903091627"/>
+<plugin id="org.w3c.dom.events"/>
+<plugin id="org.w3c.dom.events.source"/>
+<plugin id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
+<plugin id="org.w3c.dom.smil" version="1.0.1.v200903091627"/>
+<plugin id="org.w3c.dom.smil.source" version="1.0.1.v200903091627"/>
+<plugin id="org.w3c.dom.smil.source" version="1.0.0.v200806040011"/>
+<plugin id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
+<plugin id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
+<plugin id="org.w3c.dom.svg.source" version="1.1.0.v201011041433"/>
+<plugin id="org.w3c.dom.svg.source" version="1.1.0.v201011041433"/>
+</includeBundles>
+</target>
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
index 39b5149..d1775e6 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
+++ b/releng/org.eclipse.emf.ecp.target.rcp/ecp.tpd
@@ -1,11 +1,28 @@
target "ECP RCP"
-location "http://download.eclipse.org/eclipse/updates/4.4" {
+with source configurePhase
+
+location "http://download.eclipse.org/technology/swtbot/releases/latest/" {
+ org.eclipse.swtbot.forms.feature.group
+ org.eclipse.swtbot.eclipse.feature.group
+ org.eclipse.swtbot.eclipse.gef.feature.group
+ org.eclipse.swtbot.feature.group
+ org.eclipse.swtbot.eclipse.test.junit.feature.group
+}
+
+location "http://download.eclipse.org/eclipse/updates/4.6" {
org.eclipse.equinox.sdk.feature.group
org.eclipse.platform.ide
}
-location "http://download.eclipse.org/emf-store/releases_14" {
+location "http://download.eclipse.org/eclipse/updates/4.5" {
+ org.eclipse.core.databinding
+ org.eclipse.core.databinding.beans
+ org.eclipse.core.databinding.observable
+ org.eclipse.core.databinding.property
+}
+
+location "http://download.eclipse.org/emfstore/releases_18" {
org.eclipse.emf.emfstore.client.transaction.feature.feature.group
org.eclipse.emf.emfstore.client.feature.feature.group
org.eclipse.emf.emfstore.common.feature.feature.group
@@ -15,7 +32,7 @@
org.eclipse.emf.emfstore.ecore.feature.feature.group
}
-location "http://download.eclipse.org/releases/luna/" {
+location "http://download.eclipse.org/releases/neon" {
org.eclipse.jdt.feature.group
org.eclipse.emf.sdk.feature.group
org.eclipse.gef.sdk.feature.group
@@ -26,31 +43,39 @@
org.eclipse.net4j.sdk.feature.group
org.eclipse.emf.cdo.sdk.feature.group
org.eclipse.pde.feature.group
- org.eclipse.ocl.all.sdk.feature.group
+ org.eclipse.ocl.all.sdk.feature.group
+ org.eclipse.xtend.sdk.feature.group
}
-location "http://build.eclipse.org/rt/rap/base-platforms/2.3/extra-dependencies/" {
- org.mockito.mockito-all
+location "http://build.eclipse.org/rt/rap/base-platforms/3.1/extra-dependencies/" {
+ org.mockito.mockito-core-hamcrest-modified
}
-location "http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/" {
- org.apache.log4j.source
- org.objenesis.source
- org.apache.log4j
- org.objenesis
- org.h2.source
- org.h2
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/" {
javax.validation
+ org.apache.poi.source
+ org.apache.poi
+ org.apache.log4j.source
+ org.objenesis
+ org.objenesis.source
+ org.h2
javax.validation.source
+ org.apache.log4j
+ org.h2.source
+ com.google.gson.source
+ com.google.gson
+ com.google.guava
+ com.google.guava.source
+ org.hamcrest.core
+ org.hamcrest.library
+ org.hamcrest.library.source
}
-location "http://download.eclipse.org/edapt/releases/10x/101" {
+location "http://download.eclipse.org/edapt/releases/12x" {
org.eclipse.emf.edapt.runtime.feature.feature.group
+ org.eclipse.emf.edapt.runtime.feature.source.feature.group
}
-location "http://download.eclipse.org/technology/swtbot/releases/latest/" {
- org.eclipse.swtbot.eclipse.gef.feature.group
- org.eclipse.swtbot.forms.feature.group
- org.eclipse.swtbot.eclipse.feature.group
- org.eclipse.swtbot.feature.group
+location "http://download.eclipse.org/nebula/releases/1.0.0" {
+ org.eclipse.nebula.widgets.grid.feature.feature.group
}
diff --git a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
index c8d8c2d..78d1289 100644
--- a/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
+++ b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>
</project>
\ No newline at end of file
diff --git a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
index d558a04..fe4d6bb 100644
--- a/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
+++ b/releng/spreadsheet/org.eclipse.emfforms.spreadsheet.releng.target/emfforms_spreadsheet.target
@@ -9,7 +9,7 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_19/"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_110/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="0.0.0"/>
@@ -22,7 +22,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.apache.poi.source" version="0.0.0"/>
@@ -44,5 +44,9 @@
<unit id="org.eclipse.emf.edapt.runtime.feature.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/edapt/releases/12x"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.grid.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/nebula/releases/1.0.0"/>
+</location>
</locations>
</target>
diff --git a/tests/ECPQ7Tests/EPPTests/pom.xml b/tests/ECPQ7Tests/EPPTests/pom.xml
index c04d48b..f27047a 100644
--- a/tests/ECPQ7Tests/EPPTests/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/pom.xml
@@ -23,7 +23,7 @@
</profile>
</profiles>
<properties>
- <emfstore-update-site>http://download.eclipse.org/emfstore/releases_16</emfstore-update-site>
+ <emfstore-update-site>http://download.eclipse.org/emfstore/releases_18</emfstore-update-site>
<eclipse-product>http://mirror.cc.columbia.edu/pub/software/eclipse/technology/epp/downloads/release/${eclipse-name}/${eclipse-sr}/eclipse-modeling-${eclipse-name}-${eclipse-sr}-linux-gtk-x86_64.tar.gz</eclipse-product>
</properties>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml b/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml
index bf992be..5ac42ee 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml
@@ -12,7 +12,7 @@
<packaging>rcpttTest</packaging>
<properties>
- <eclipse-name>mars</eclipse-name>
- <eclipse-sr>1</eclipse-sr>
+ <eclipse-name>neon</eclipse-name>
+ <eclipse-sr>R</eclipse-sr>
</properties>
</project>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml b/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml
index e097d0f..b460a03 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml
@@ -12,7 +12,7 @@
<packaging>rcpttTest</packaging>
<properties>
- <eclipse-name>luna</eclipse-name>
- <eclipse-sr>SR2</eclipse-sr>
+ <eclipse-name>mars</eclipse-name>
+ <eclipse-sr>2</eclipse-sr>
</properties>
</project>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/Create View Model.test b/tests/ECPQ7Tests/EPPTests/update-site/project/Create View Model.test
index 491e3c7..dcf6e64 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/Create View Model.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/Create View Model.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _CcjB8C3lEeSwhO5Nwx0hPg
-Runtime-Version: 2.0.1.201508250612
-Save-Time: 10/7/15 4:00 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 12:49 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -30,7 +30,7 @@
get-button Finish | click
}
-with [get-tab-folder -index 3] {
+with [get-tab-folder -index 2] {
get-property "pages[0]" | equals "Task2.view" | verify-true
get-property tabCount | equals 1 | verify-true
}
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/CreateViewModelProj.test b/tests/ECPQ7Tests/EPPTests/update-site/project/CreateViewModelProj.test
index 65ad1190..c03b632 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/CreateViewModelProj.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/CreateViewModelProj.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _4U-bIDNtEeSiS7b7ptZeHw
-Runtime-Version: 2.0.1.201508250612
-Save-Time: 10/7/15 4:08 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 12:49 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -29,7 +29,7 @@
get-button Finish | click
}
-with [get-tab-folder -index 3] {
+with [get-tab-folder -index 2] {
get-property "pages[0]" | equals "Task.view" | verify-true
get-property "pages[1]" | equals "User.view" | verify-true
get-property tabCount | equals 2 | verify-true
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
index 4175350..edcee7c 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _lx7aYE_YEeWlOMw7vcjT4A
-Runtime-Version: 1.5.5.201503020312
-Save-Time: 9/23/15 4:20 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 12:56 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -57,7 +57,7 @@
// 03 The View Model Editor: verify (default controls)
get-editor "User.view" | get-button "Open Preview" | click
-get-view "EMF Forms Preview" | get-button "Clean Sample Data" | click
+get-view "EMF Forms Preview" | get-button "Clear Sample Data" | click
get-editor "User.view" | get-button "Open Preview" | click
with [get-view "EMF Forms Preview"] {
@@ -76,7 +76,7 @@
get-button -after [get-label Active] | check
get-button "Select Date" | click
}
-with [get-window -from "DateTimeControlSWTRenderer$SetBtnSelectionAdapterExtension.widgetSelected()"] {
+with [get-window -from "DateTimeControlSWTRenderer$SetBtnSelectionAdapterExtension.setDate()"] {
get-date-time | set-value "2015/6/3 0:0:0"
get-button OK | click
}
@@ -104,7 +104,7 @@
// 03 The View Model Editor: verify (manual controls)
get-editor "User.view" | get-button "Open Preview" | click
-get-view "EMF Forms Preview" | get-button "Clean Sample Data" | click
+get-view "EMF Forms Preview" | get-button "Clear Sample Data" | click
with [get-editor "User.view" | get-tree] {
select "User/Control firstName" "User/Control lastName" "User/Control gender" "User/Control active" "User/Control timeOfRegistration" "User/Control weight" "User/Control heigth" "User/Control nationality" "User/Control dateOfBirth" "User/Control email" "User/Control tasks"
@@ -127,7 +127,7 @@
get-editor "User.view" | get-button "Open Preview" | click
with [get-view "EMF Forms Preview"] {
get-button "Refresh Preview View" | click
- get-control Any -after [get-label "View Editor Preview"] -index 8 | get-property "getChildren().length" | equals 9
+ get-control Any -after [get-label "View Editor Preview"] -index 9 | get-property "getChildren().length" | equals 9
| verify-true
get-editbox -after [get-label "Last Name*"] | get-property text | equals "" | verify-true
with [get-label "" -after [get-label "Last Name*"]] {
@@ -152,7 +152,7 @@
// 03 The View Model Editor: verify (manual controls reorder)
get-view "EMF Forms Preview" | get-button "Refresh Preview View" | click
-with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 8] {
+with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 9] {
get-property "getChildren().Control[0].getText()" | equals "First Name" | verify-true
get-property "getChildren().Control[3].getText()" | equals "Last Name*" | verify-true
}
@@ -169,7 +169,7 @@
drag-end -detail move
}
get-view "EMF Forms Preview" | get-button "Refresh Preview View" | click
-with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 8] {
+with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 9] {
get-property "getChildren().Control[0].getText()" | equals "Last Name*" | verify-true
get-property "getChildren().Control[3].getText()" | equals "First Name" | verify-true
}
@@ -231,7 +231,7 @@
// 04 The First View Model: verify
get-view "EMF Forms Preview" | get-button "Refresh Preview View" | click
with [get-view "EMF Forms Preview"] {
- get-control Any -after [get-label "View Editor Preview"] -index 9 | get-property "getLayout().numColumns"
+ get-control Any -after [get-label "View Editor Preview"] -index 10 | get-property "getLayout().numColumns"
| equals 2 | verify-true
get-label Active | get-property caption | equals Active | verify-true
with [get-control Any -after [get-label Nationality] -index 9] {
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/Installation.test b/tests/ECPQ7Tests/EPPTests/update-site/project/Installation.test
index c3178a9..24dcd30 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/Installation.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/Installation.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _jbzigJ7xEeOleLZC7V9mLg
-Runtime-Version: 1.5.2.201408180747
-Save-Time: 9/30/14 2:05 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 12:44 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -19,15 +19,15 @@
get-button "Add..." | click
with [get-window "Add Repository"] {
get-editbox -after [get-label "Name:"] | set-text ecp
- get-editbox -after [get-label "Location:"] | set-text "http://download.eclipse.org/ecp/releases/releases_17"
+ get-editbox -after [get-label "Location:"] | set-text "http://download.eclipse.org/ecp/releases/releases_110"
get-button OK | click
}
}
-get-window Install | get-tree | get-item "All SDKs \\(install one of these\\)/ECP SDK 3.x" | get-property caption | equals "ECP SDK 3.x"
+get-window Install | get-tree | get-item "All SDKs \\(install one of these\\)/EMF Forms SDK" | get-property caption | equals "EMF Forms SDK"
| verify-true
with [get-window Install] {
with [get-tree] {
- get-item "All SDKs \\(install one of these\\)/ECP SDK 3.x" | check
+ get-item "All SDKs \\(install one of these\\)/EMF Forms SDK" | check
}
with [get-button "Next >"] {
click
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
index f4345dc..5ebfd54 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _foqG8GzgEeWQGtcwdcx-qw
-Runtime-Version: 2.0.1.201508250612
-Save-Time: 10/7/15 1:24 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 12:59 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -179,13 +179,13 @@
get-property "getChildren().Control[1].getStyle()" | contains "NO_FOCUS" | verify-true
get-property "getChildren().Control[1].getStyle()" | contains "LEFT_TO_RIGHT" | verify-true
get-property "getChildren().Control[1].getStyle()" | contains "LEAD" | verify-true
- get-property "getChildren().Control[2].getClassName()" | equals "org.eclipse.swt.widgets.Text" | verify-true
- get-property "getChildren().Control[2].getMessage()" | equals "First Name" | verify-true
- get-property "getChildren().Control[2].getStyle()" | contains "SINGLE" | verify-true
- get-property "getChildren().Control[2].getStyle()" | contains "BORDER" | verify-true
- get-property "getChildren().Control[2].getStyle()" | contains "LEFT_TO_RIGHT" | verify-true
- get-property "getChildren().Control[2].getStyle()" | contains "LEFT" | verify-true
- get-property "getChildren().Control[2].toString()" | equals "Text {}" | verify-true
+ get-property "getChildren().Control[2].getChildren().Control[0].getClassName()" | equals "org.eclipse.swt.widgets.Text" | verify-true
+ get-property "getChildren().Control[2].getChildren().Control[0].getMessage()" | equals "First Name" | verify-true
+ get-property "getChildren().Control[2].getChildren().Control[0].getStyle()" | contains "SINGLE" | verify-true
+ get-property "getChildren().Control[2].getChildren().Control[0].getStyle()" | contains "BORDER" | verify-true
+ get-property "getChildren().Control[2].getChildren().Control[0].getStyle()" | contains "LEFT_TO_RIGHT" | verify-true
+ get-property "getChildren().Control[2].getChildren().Control[0].getStyle()" | contains "LEFT" | verify-true
+ get-property "getChildren().Control[2].getChildren().Control[0].toString()" | equals "Text {}" | verify-true
}
// label
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/Date.test b/tests/ECPQ7Tests/NonEPPTests/Editor/Date.test
index b3112f7..29eacd0 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/Date.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/Date.test
@@ -1,13 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _f3qEUVpSEeKcnaHGSt8OwA,_YQj0cT-VEeK-yuKsz0Lang
Element-Name: Date
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _2jgNMHHXEeKndsdNMEr_UQ
-Save-Time: 2/13/13 11:50 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 3:07 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -16,6 +16,6 @@
Entry-Name: .content
get-view "Model Explorer" | get-tree | select "TestProject/League America/Player Maximilian" | double-click
-get-editor "Player Maximilian" | get-label "No date set! Click to set date." | get-property caption
- | equals "This widget needs to be revised" | verify-true
+get-editor "Player Maximilian" | get-label "No date set! Click button to set date." | get-property caption
+ | equals "No date set! Click button to set date." | verify-true
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/Double.test b/tests/ECPQ7Tests/NonEPPTests/Editor/Double.test
index 06c939b..821ae1d 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/Double.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/Double.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _mY5uUKEgEeKX8e34E6tWIg,_rr2EEFpSEeKcnaHGSt8OwA,_f3qEUVpSEeKcnaHGSt8OwA,_IuFcgFpZEeKcnaHGSt8OwA,__UtTgD-XEeK-yuKsz0Lang
Element-Name: Double
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _k5jCAHHZEeKndsdNMEr_UQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 11/7/13 4:01 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 3:02 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -70,13 +69,14 @@
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]/League America/Player Jonas" | double-click
get-editor "Player Jonas" | get-editbox -after [get-label Height] | get-property text | equals "656.89" | verify-true
with [get-editor "Player Jonas"] {
- // 10e3 gets converted to 10 since scientific notation is not accepted
+ // 10e3 gets rejected
get-editbox -after [get-label Height] | set-text "10e3"
+ get-window "Invalid Number" | get-button OK | click
get-editbox -after [get-label Name] | click-text 6
close
}
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]/League America/Player Jonas" | double-click
-get-editor "Player Jonas" | get-editbox -after [get-label Height] | get-property text | equals "10" | verify-true
+get-editor "Player Jonas" | get-editbox -after [get-label Height] | get-property text | equals "656.89" | verify-true
get-view "Model Explorer" | get-tree | select "TestProjectSecondCheckOut \\[trunk, Version 0\\]/League America/Player Maximilian"
| double-click
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/Editor.suite b/tests/ECPQ7Tests/NonEPPTests/Editor/Editor.suite
index 344d284..a1796bd 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/Editor.suite
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/Editor.suite
@@ -1,12 +1,11 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: Editor
Element-Type: testsuite
Element-Version: 2.0
Id: _r0qowHHTEeKndsdNMEr_UQ
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 11/6/13 9:45 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:59 PM
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
Content-Type: text/testcase
@@ -24,24 +23,6 @@
_axAiYDyVEeOk_dMIOzb4CA // kind: 'test' name: 'NewDouble' path: 'NewDouble.test'
_QSZfMHHWEeKndsdNMEr_UQ // kind: 'test' name: 'String' path: 'String.test'
_6xi7QQpDEeOJrN9cdzAxHQ // kind: 'test' name: 'ValidationDecoratorInEditor' path: 'ValidationDecoratorInEditor.test'
-_kms5UIpVEeK80-dAVHg-DA // kind: 'test' name: 'AddRow' path: 'Table/AddRow.test'
-_GLHKgIpeEeK80-dAVHg-DA // kind: 'test' name: 'AddRowAndSetBigInt' path: 'Table/AddRowAndSetBigInt.test'
-_IWxDYIpWEeK80-dAVHg-DA // kind: 'test' name: 'DeleteRow' path: 'Table/DeleteRow.test'
-_ObfJcIpXEeK80-dAVHg-DA // kind: 'test' name: 'DeleteRows' path: 'Table/DeleteRows.test'
-_ud-CkEYUEeOmh5SOkeuFtw // kind: 'test' name: 'MaxBoundReference' path: 'Table/MaxBoundReference.test'
-_gvAuUEYLEeOmh5SOkeuFtw // kind: 'test' name: 'MinBoundReference' path: 'Table/MinBoundReference.test'
-_oawGcUYVEeO347zZ7X5NJw // kind: 'test' name: 'ReadOnlyTable' path: 'Table/ReadOnlyTable.test'
-_amLggIpeEeK80-dAVHg-DA // kind: 'test' name: 'SetBigDecimal' path: 'Table/SetBigDecimal.test'
-_Uv2qIEYKEeOmh5SOkeuFtw // kind: 'test' name: 'SetBigInteger' path: 'Table/SetBigInteger.test'
-_GW5PoIpREeK80-dAVHg-DA // kind: 'test' name: 'SetBoolean' path: 'Table/SetBoolean.test'
-_bYjBUIpNEeK80-dAVHg-DA // kind: 'test' name: 'SetDate' path: 'Table/SetDate.test'
-_zSJeQIpOEeK80-dAVHg-DA // kind: 'test' name: 'SetDouble' path: 'Table/SetDouble.test'
-_b_DD0IpREeK80-dAVHg-DA // kind: 'test' name: 'SetEMail' path: 'Table/SetEMail.test'
-_s2yJMDsaEeOSoJrMKArUHA // kind: 'test' name: 'SetEnum' path: 'Table/SetEnum.test'
-_X66MEIf4EeKpyoBptqEfAg // kind: 'test' name: 'SetInt' path: 'Table/SetInt.test'
-_cga1EIpdEeK80-dAVHg-DA // kind: 'test' name: 'SetMultiRef' path: 'Table/SetMultiRef.test'
-_Mr1VQYpNEeK80-dAVHg-DA // kind: 'test' name: 'SetString' path: 'Table/SetString.test'
-_aJUTcIpgEeK80-dAVHg-DA // kind: 'test' name: 'ValidateBigDecimal' path: 'Table/ValidateBigDecimal.test'
__Gg_AIpgEeK80-dAVHg-DA // kind: 'suite' name: 'TableSuite' path: 'Table/TableSuite.suite'
_7xT6QXXGEeK2tZkPdpUavQ // kind: 'test' name: 'MultiBoolean' path: 'Multicontrols/MultiBoolean.test'
_fytq8HXSEeK2tZkPdpUavQ // kind: 'test' name: 'MultiDouble' path: 'Multicontrols/MultiDouble.test'
@@ -49,5 +30,7 @@
_YJbUcHXJEeK2tZkPdpUavQ // kind: 'test' name: 'MultiInt' path: 'Multicontrols/MultiInt.test'
_7fNEUHXLEeK2tZkPdpUavQ // kind: 'test' name: 'MultiReference' path: 'Multicontrols/MultiReference.test'
_l3nLwHHkEeKndsdNMEr_UQ // kind: 'test' name: 'MultiString' path: 'Multicontrols/MultiString.test'
+_HzFpMGs4EeSUs_kOwABuHQ // kind: 'test' name: 'TreeMasterDetailContextMenuFeatureMap' path: 'TreeMasterDetailContextMenuFeatureMap.test'
+_GYZaMHlAEeO9Ja8zvRhhOQ // kind: 'test' name: 'XMLDate' path: 'XMLDate.test'
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/NewDate.test b/tests/ECPQ7Tests/NonEPPTests/Editor/NewDate.test
index d49d96c..49ec80f 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/NewDate.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/NewDate.test
@@ -1,14 +1,13 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Contexts: _mY5uUKEgEeKX8e34E6tWIg,_rr2EEFpSEeKcnaHGSt8OwA,_f3qEUVpSEeKcnaHGSt8OwA,_IuFcgFpZEeKcnaHGSt8OwA,__UtTgD-XEeK-yuKsz0Lang
Element-Name: NewDate
Element-Type: testcase
Element-Version: 3.0
External-Reference:
Id: _LsZZEDyoEeOyfvx0Xny3Ig
-Q7-Runtime-Version: 1.3.9.201310250528
-Save-Time: 1/29/14 3:47 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 3:44 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -18,6 +17,8 @@
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]/League America/Player Jonas"
| double-click
+get-editor "Player Jonas" | get-button "Select Date" | click
+get-window -from "DateTimeControlSWTRenderer$SetBtnSelectionAdapterExtension.setDate()" | get-button OK | click
with [get-editor "Player Jonas"] {
with [get-date-time] {
set-value "1988/12/5 15:22:49"
@@ -26,6 +27,8 @@
}
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]/League America/Player Maximilian"
| double-click
+get-editor "Player Maximilian" | get-button "Select Date" | click
+get-window -from "DateTimeControlSWTRenderer$SetBtnSelectionAdapterExtension.setDate()" | get-button OK | click
with [get-editor "Player Maximilian" | get-date-time] {
set-value "1976/8/24 15:19:3"
}
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/Table/DetailEditing.test b/tests/ECPQ7Tests/NonEPPTests/Editor/Table/DetailEditing.test
index d9111d5..e569a72 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/Table/DetailEditing.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/Table/DetailEditing.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _S2QsofiCEeOywJv-3eEoIg
-Runtime-Version: 1.5.4.201410231434
-Save-Time: 12/19/14 4:45 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 3:12 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -25,13 +25,10 @@
get-tree | select "university/CourseCatalog"
get-button Finish | click
}
-get-editor "Course Catalog" | get-button -after [get-label Courses] | get-property enablement | equals false
+get-editor "Course Catalog" | get-button "Remove the selected Course" | get-property enablement | equals false
| verify-true
get-editor "Course Catalog" | get-button "Add an instance of Course" | click
-get-editor "Course Catalog" | get-button -after [get-label Courses] | get-property enablement | equals false
- | verify-true
-get-editor "Course Catalog" | get-table | select 0 -column Etcs
-get-editor "Course Catalog" | get-button -after [get-label Courses] | get-property enablement | equals true
+get-editor "Course Catalog" | get-button "Remove the selected Course" | get-property enablement | equals true
| verify-true
get-editor "Course Catalog" | get-button -after [get-label Courses] | click
with [get-window Course] {
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/Table/ReadOnlyTable.test b/tests/ECPQ7Tests/NonEPPTests/Editor/Table/ReadOnlyTable.test
index 8b49e9c..1c7b6e1 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/Table/ReadOnlyTable.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/Table/ReadOnlyTable.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _oawGcUYVEeO347zZ7X5NJw
-Runtime-Version: 1.5.4.201410231434
-Save-Time: 12/11/14 10:27 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 3:50 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -27,11 +27,17 @@
}
get-editor TableControl | get-button "Create and link new Domain Model Reference" | click
-with [get-window "New Reference Element"] {
- get-button "Link Domain Model EFeature" | click
- with [get-window "Select a EStructuralFeature"] {
- get-tree | select "games : Game"
- get-button OK | click
+with [get-window "Configure TableDomainModelReference"] {
+ get-button "Create and link new Domain Model Reference" | click
+ with [get-window "New Reference Element"] {
+ get-tree | select "model/FeaturePathDomainModelReference" | click
+ get-button "Next >" | click
+ get-button "Link Domain Model EFeature" | click
+ with [get-window "Select a EStructuralFeature"] {
+ get-tree | select "games : Game"
+ get-button OK | click
+ }
+ get-button Finish | click
}
get-button Finish | click
}
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/Table/TableSuite.suite b/tests/ECPQ7Tests/NonEPPTests/Editor/Table/TableSuite.suite
index f040521..2f6e79c 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/Table/TableSuite.suite
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/Table/TableSuite.suite
@@ -1,12 +1,11 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: TableSuite
Element-Type: testsuite
Element-Version: 2.0
Id: __Gg_AIpgEeK80-dAVHg-DA
-Q7-Runtime-Version: 1.3.11.201403141124
-Save-Time: 6/20/14 3:55 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 3:49 PM
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
Content-Type: text/testcase
@@ -27,9 +26,8 @@
_kms5UIpVEeK80-dAVHg-DA // kind: 'test' name: 'AddRow' path: 'AddRow.test'
_Uv2qIEYKEeOmh5SOkeuFtw // kind: 'test' name: 'SetBigInteger' path: 'SetBigInteger.test'
_s2yJMDsaEeOSoJrMKArUHA // kind: 'test' name: 'SetEnum' path: 'SetEnum.test'
-_S2QsofiCEeOywJv-3eEoIg // kind: 'test' name: 'DetailEditing' path: 'DetailEditing.test'
-_oawGcUYVEeO347zZ7X5NJw // kind: 'test' name: 'ReadOnlyTable' path: 'ReadOnlyTable.test'
_ud-CkEYUEeOmh5SOkeuFtw // kind: 'test' name: 'MaxBoundReference' path: 'MaxBoundReference.test'
_gvAuUEYLEeOmh5SOkeuFtw // kind: 'test' name: 'MinBoundReference' path: 'MinBoundReference.test'
+_50-KoCeuEeSaN-fwc2C_0w // kind: 'test' name: 'DetailEditingPane' path: 'DetailEditingPane.test'
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/ECPQ7Tests/NonEPPTests/Editor/TreeMasterDetailContextMenuFeatureMap.test b/tests/ECPQ7Tests/NonEPPTests/Editor/TreeMasterDetailContextMenuFeatureMap.test
index e5ac969..759dbf9 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Editor/TreeMasterDetailContextMenuFeatureMap.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Editor/TreeMasterDetailContextMenuFeatureMap.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _HzFpMGs4EeSUs_kOwABuHQ
-Runtime-Version: 2.0.0.201506120617
-Save-Time: 4/19/16 12:10 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 3:59 PM
Tags: skipExecution
Testcase-Type: ecl
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/EditorReadOnly.suite b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/EditorReadOnly.suite
index 2dbfbfc..726d6a2 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/EditorReadOnly.suite
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/EditorReadOnly.suite
@@ -1,12 +1,11 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
Element-Name: EditorReadOnly
Element-Type: testsuite
Element-Version: 2.0
Id: _EVoJ8EbnEeOawrDkidiyfA
-Q7-Runtime-Version: 1.3.7.201309090800
-Save-Time: 11/7/13 4:11 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:10 PM
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
Content-Type: text/testcase
@@ -20,5 +19,8 @@
_ojoS0DyXEeOk_dMIOzb4CA // kind: 'test' name: 'ReadOnlyInteger' path: 'ReadOnlyInteger.test'
_9id-EDy0EeO8kN1jLMK8wg // kind: 'test' name: 'ReadOnlyLink' path: 'ReadOnlyLink.test'
_rKjTETspEeOHj9Cw0T_k4Q // kind: 'test' name: 'ReadOnlyString' path: 'ReadOnlyString.test'
+_ZFIgQYQvEeOewrJdzmuGPg // kind: 'test' name: 'ReadonlyAttributeMultiControl' path: 'ReadonlyAttributeMultiControl.test'
+_pgFycIQREeO0WrMxvPcxtw // kind: 'test' name: 'ReadOnlyReferenceMultiControl' path: 'ReadOnlyReferenceMultiControl.test'
+_W0km0HlCEeO9Ja8zvRhhOQ // kind: 'test' name: 'ReadOnlyXMLDate' path: 'ReadOnlyXMLDate.test'
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigDecimal.test b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigDecimal.test
index 4a88bb6..756a89d 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigDecimal.test
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigDecimal.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _b8sq4DzAEeO8kN1jLMK8wg
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/20/15 10:23 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:28 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -28,7 +28,7 @@
get-button "Next >" | click
get-button "Link Domain Model EFeature" | click
with [get-window "Select a EStructuralFeature"] {
- get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]/winLossRatio : EBigDecimal"
+ get-tree | select "winLossRatio : EBigDecimal"
get-button OK | click
}
get-button Finish | click
@@ -53,7 +53,7 @@
get-editor "Player John" | close
get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
-get-editor "Player John" | get-editbox -after [get-label "Win Loss Ratio"] | get-property readOnly | equals true
+get-editor "Player John" | get-editbox -after [get-label "Win Loss Ratio"] | get-property enablement | equals false
| verify-true
} -finally {
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigInteger.test b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigInteger.test
index d303074..60c89c2 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigInteger.test
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyBigInteger.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _ySBRoDzBEeO8kN1jLMK8wg
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/20/15 10:23 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:29 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -31,7 +31,7 @@
get-button "Next >" | click
get-button "Link Domain Model EFeature" | click
with [get-window "Select a EStructuralFeature"] {
- get-tree | select "bowling/Matchup \\[org.eclipse.emf.emfstore.bowling.Matchup\\]/nrSpectators : EBigInteger"
+ get-tree | select "nrSpectators : EBigInteger"
get-button OK | click
}
get-button Finish | click
@@ -56,7 +56,7 @@
get-editor Matchup | close
get-view "Model Explorer" | get-tree | select "TestProject/Tournament Amateur/Matchup" | double-click
get-editor Matchup | get-editbox -after [get-label "Nr Spectators"] | click-text
-get-editor Matchup | get-editbox -after [get-label "Nr Spectators"] | get-property readOnly | equals true | verify-true
+get-editor Matchup | get-editbox -after [get-label "Nr Spectators"] | get-property enablement | equals false | verify-true
} -finally {
/*
get-view "Model Explorer" | get-tree | select "Project/View" | double-click
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyDateTime.test b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyDateTime.test
index 89afa31..0c82fa4 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyDateTime.test
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyDateTime.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _yMPf8TykEeOyfvx0Xny3Ig
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/20/15 11:17 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:04 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -52,8 +52,8 @@
get-editor View | click
get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
with [get-editor "Player John"] {
- get-label "No date set! Click to set date." | get-property enablement | equals false | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals false | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals false | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals false | verify-true
}
} -finally {
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyEnum.test b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyEnum.test
index 5101918..a885179 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyEnum.test
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyEnum.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _2Po7kTyyEeO8kN1jLMK8wg
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/20/15 10:21 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:29 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -28,7 +28,7 @@
get-button "Next >" | click
get-button "Link Domain Model EFeature" | click
with [get-window "Select a EStructuralFeature"] {
- get-tree | select "bowling/Tournament \\[org.eclipse.emf.emfstore.bowling.Tournament\\]/type : TournamentType"
+ get-tree | select "type : TournamentType"
get-button OK | click
}
get-button Finish | click
@@ -62,7 +62,6 @@
get-view "Model Explorer" | get-tree | select "TestProject/Tournament Amateur" | double-click
with [get-editor "Tournament Amateur" | get-combo -after [get-label Type]] {
get-property enablement | equals false | verify-true
- get-property readOnly | equals true | verify-true
}
} -finally {
/*
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyInteger.test b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyInteger.test
index ab26e3e..0e39520 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyInteger.test
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyInteger.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _ojoS0DyXEeOk_dMIOzb4CA
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/20/15 10:22 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:29 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -28,7 +28,7 @@
get-button "Next >" | click
get-button "Link Domain Model EFeature" | click
with [get-window "Select a EStructuralFeature"] {
- get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]/numberOfVictories : EInt"
+ get-tree | select "numberOfVictories : EInt"
get-button OK | click
}
get-button Finish | click
@@ -54,7 +54,7 @@
get-editor View | click
get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
get-editor "Player John" | get-editbox -after [get-label "Number Of Victories"] | click-text 1
-get-editor "Player John" | get-editbox -after [get-label "Number Of Victories"] | get-property readOnly | equals true
+get-editor "Player John" | get-editbox -after [get-label "Number Of Victories"] | get-property enablement | equals false
| verify-true
get-view "Model Explorer" | get-tree | select "Project/View"
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyString.test b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyString.test
index defb170..77dea92 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyString.test
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyString.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _rKjTETspEeOHj9Cw0T_k4Q
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/20/15 10:24 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:29 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -28,7 +28,7 @@
get-button "Next >" | click
get-button "Link Domain Model EFeature" | click
with [get-window "Select a EStructuralFeature"] {
- get-tree | select "bowling/Player \\[org.eclipse.emf.emfstore.bowling.Player\\]/name : EString"
+ get-tree | select "name : EString"
get-button OK | click
}
get-button Finish | click
@@ -54,7 +54,7 @@
get-editor "Player John" | close
get-view "Model Explorer" | get-tree | select "TestProject/Player John" | double-click
-get-editor "Player John" | get-editbox -after [get-label Name] | get-property readOnly | equals true
+get-editor "Player John" | get-editbox -after [get-label Name] | get-property enablement | equals false
| verify-true
} -finally {
/*
diff --git a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyXMLDate.test b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyXMLDate.test
index 53373fb..e74d978 100644
--- a/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyXMLDate.test
+++ b/tests/ECPQ7Tests/NonEPPTests/EditorReadonly/ReadOnlyXMLDate.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _W0km0HlCEeO9Ja8zvRhhOQ
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/20/15 10:25 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 2:30 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -34,7 +34,7 @@
get-button "Next >" | click
get-button "Link Domain Model EFeature" | click
with [get-window "Select a EStructuralFeature"] {
- get-tree | select "bowling/Referee \\[org.eclipse.emf.emfstore.bowling.Referee\\]/dateOfBirth : XMLDate"
+ get-tree | select "dateOfBirth : XMLDate"
get-button OK | click
}
get-button Finish | click
@@ -62,7 +62,7 @@
get-editor View | close
get-editor "Control dateOfBirth" | close
get-view "Model Explorer" | get-tree | select "TestProject/Referee" | double-click
- get-editor Referee | get-editbox -after [get-label "Date Of Birth"] | get-property readOnly | equals true | verify-true
+ get-editor Referee | get-editbox -after [get-label "Date Of Birth"] | get-property enablement | equals false | verify-true
} -finally {
/*
get-view "Model Explorer" | get-tree | select "Project/View" | double-click
diff --git a/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest1.test b/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest1.test
index 957f43a..a54af54 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest1.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest1.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _PyfLgGtLEeWukfCGOpNfzw
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/21/15 12:30 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 1:57 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -128,31 +128,31 @@
get-tree | select "Model/Player" | double-click
}
with [get-editor Player] {
- get-label "No date set! Click to set date." | get-property enablement | equals false | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals false | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals false | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals false | verify-true
get-button -after [get-label "Is Professional"] | check
get-editbox -after [get-label Name] | set-text test
get-editbox -after [get-label "Number Of Victories"] | click-text 1
- get-label "No date set! Click to set date." | get-property enablement | equals true | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals true | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals true | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals true | verify-true
get-button -after [get-label "Is Professional"] | uncheck
get-editbox -after [get-label Name] | set-text ""
get-editbox -after [get-label "Number Of Victories"] | click-text 1
get-editbox -after [get-label "Number Of Victories"] | set-text 6
get-editbox -after [get-label Height] | set-text "5.5"
get-editbox -after [get-label "Number Of Victories"] | click-text 1
- get-label "No date set! Click to set date." | get-property enablement | equals true | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals true | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals true | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals true | verify-true
get-button -after [get-label "Is Professional"] | check
get-editbox -after [get-label Name] | set-text test
get-editbox -after [get-label "Number Of Victories"] | click-text 1
- get-label "No date set! Click to set date." | get-property enablement | equals true | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals true | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals true | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals true | verify-true
get-button -after [get-label "Is Professional"] | uncheck
get-editbox -after [get-label "Number Of Victories"] | set-text 7
get-editbox -after [get-label Height] | click-text 1
- get-label "No date set! Click to set date." | get-property enablement | equals false | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals false | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals false | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals false | verify-true
}
} -finally {
get-view "Model Explorer" | get-tree | select "Project/View" | get-menu "Unset Root EClass" | click
diff --git a/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest2.test b/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest2.test
index b526646..1b8ba42 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest2.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Rules/Rules_smokeTest2.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _2Ozl0HlSEeOByOq_5szdNw
-Runtime-Version: 1.5.4.201412181238
-Save-Time: 11/21/15 12:35 AM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 9/5/16 1:55 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -78,17 +78,17 @@
get-editor "Leaf Condition true" | close
get-view "Model Explorer" | get-tree | select "Model/Player" | double-click
with [get-editor Player] {
- get-label "No date set! Click to set date." | get-property enablement | equals false | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals false | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals false | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals false | verify-true
get-button -after [get-label "Is Professional"] | check
- get-label "No date set! Click to set date." | get-property enablement | equals true | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals true | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals true | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals true | verify-true
get-button -after [get-label "Is Professional"] | uncheck
get-editbox -after [get-label Name] | set-text test
- get-label "No date set! Click to set date." | get-property enablement | equals true | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals true | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals true | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals true | verify-true
get-button -after [get-label "Is Professional"] | check
- get-label "No date set! Click to set date." | get-property enablement | equals true | verify-true
- get-button -after [get-label "No date set! Click to set date."] | get-property enablement | equals true | verify-true
+ get-label "No date set! Click button to set date." | get-property enablement | equals true | verify-true
+ get-button -after [get-label "No date set! Click button to set date."] | get-property enablement | equals true | verify-true
}
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/pom.xml b/tests/ECPQ7Tests/pom.xml
index 1f3fae3..1ad28c0 100644
--- a/tests/ECPQ7Tests/pom.xml
+++ b/tests/ECPQ7Tests/pom.xml
@@ -8,8 +8,8 @@
<packaging>pom</packaging>
<properties>
- <rcptt-runner-version>2.0.1</rcptt-runner-version>
- <rcptt-maven-version>2.0.1</rcptt-maven-version>
+ <rcptt-runner-version>2.1.0</rcptt-runner-version>
+ <rcptt-maven-version>2.1.0</rcptt-maven-version>
<build_job>ecp-develop-nightly</build_job>
<currentBuild>https://hudson.eclipse.org/ecp/job/${build_job}/lastSuccessfulBuild/artifact/releng/</currentBuild>
</properties>
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
index 49f8ee3..ca16a14 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Change Broker EMFStore Provider Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.provider.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
index c73cccf..d7659f1 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.provider.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.changebroker.provider.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
index 3d1008c..a5ac028 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Change Broker Test
Bundle-SymbolicName: org.eclipse.emf.ecp.changebroker.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
index c64db6f..8f07400 100644
--- a/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.changebroker.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.changebroker.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
index 4037994..453677f 100644
--- a/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.common.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.common.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.9.0",
- org.eclipse.emf.ecp.common.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.10.0",
+ org.eclipse.emf.ecp.common.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.util;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)";visibility:=reexport
diff --git a/tests/org.eclipse.emf.ecp.common.test/pom.xml b/tests/org.eclipse.emf.ecp.common.test/pom.xml
index add3a1b..d785079 100644
--- a/tests/org.eclipse.emf.ecp.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.common.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.common.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<!-- When signing bundles we get a security exception using maven-surefire.
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
index f2cd437..c6a7cbc 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
@@ -2,12 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core Rap Sessionprovider Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.9.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.9.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.10.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.rap.rwt.service;version="0.0.0"
Service-Component: OSGI-INF/component.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.rap.rwt.service;version="0.0.0"
-
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
index f6fbd70..8ad255e 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.core.rap.sessionprovider.test</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
index 9a7f6fa..be457d6 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core RAP Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.core;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.10.0,2.0.0)",
org.osgi.framework;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
index a59bac1..9344148 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.core.rap.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
index 0ea4c1d..a4b7907 100644
--- a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.core.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.core.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="3.1.0",
org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="4.0.0",
org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.core.test/pom.xml b/tests/org.eclipse.emf.ecp.core.test/pom.xml
index 1564d14..4a14819 100644
--- a/tests/org.eclipse.emf.ecp.core.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.core.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.core.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
index 3c76ac8..ee64b17 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: Diff Merge Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.diffmerge.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
index 8eefe31..c9e505c 100644
--- a/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.diffmerge.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.diffmerge.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
index 70d1fac..242c3f5 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECore GenModel Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ecore.editor.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emf.ecp.ecore.editor.test;version="1.2.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="4.0.0",
org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: org.eclipse.ui.part;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
index 2112d42..d823aff 100644
--- a/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ecore.editor.test/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ecore.editor.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
index aabdd8f..aec2938 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.edit.internal.swt.util;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt.util;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.10.2,3.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.10.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
index 1da2363..42e4393 100644
--- a/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.edit.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.edit.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<!-- When signing bundles we get a security exception using maven-surefire.
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.core.prefs
index c537b63..edfedf9 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,425 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..8bc4bb4
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.xtend.core.Xtend.prefs b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.xtend.core.Xtend.prefs
new file mode 100644
index 0000000..bcda83e
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/.settings/org.eclipse.xtend.core.Xtend.prefs
@@ -0,0 +1,24 @@
+BuilderConfiguration.is_project_specific=true
+autobuilding=true
+eclipse.preferences.version=1
+generateGeneratedAnnotation=true
+generateSuppressWarnings=true
+generatedAnnotationComment=
+includeDateInGenerated=false
+org.eclipse.xtend.core.Xtend.useProjectSettings=true
+outlet.DEFAULT_OUTPUT.cleanDirectory=false
+outlet.DEFAULT_OUTPUT.cleanupDerived=true
+outlet.DEFAULT_OUTPUT.createDirectory=true
+outlet.DEFAULT_OUTPUT.derived=true
+outlet.DEFAULT_OUTPUT.directory=xtend-gen
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.keepLocalHistory=false
+outlet.DEFAULT_OUTPUT.override=true
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.xtend-gen.ignore=
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA5
+useJavaCompilerCompliance=true
diff --git a/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF
index 43a4f10..401a225 100644
--- a/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.emf2web.test/META-INF/MANIFEST.MF
@@ -4,8 +4,9 @@
Bundle-SymbolicName: org.eclipse.emf.ecp.emf2web.json.test
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Fragment-Host: org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,1.1.0)"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,1.1.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.emf.ecp.emf2web.generator.json;version="1.10.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
index 1f47395..98147c7 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.util.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.ide.util.test.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
@@ -14,7 +14,7 @@
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
org.eclipse.emf.common.ui;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
index 6a2e87a..9eac9bd 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ide.util.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore
index 865eb2b..b06bb69 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/X.ecore
@@ -2,6 +2,6 @@
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="xpackage" nsURI="x.nsuri" nsPrefix="xprefix">
<eClassifiers xsi:type="ecore:EClass" name="xclass">
- <eStructuralFeatures xsi:type="ecore:EReference" name="x1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="x1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore
index d7dcb16..f35364c 100644
--- a/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore
+++ b/tests/org.eclipse.emf.ecp.ide.util.test/resources/TestEcoreHelperProjectResources/view.ecore
@@ -3,7 +3,7 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model" nsURI="http://org/eclipse/emf/ecp/view/model" nsPrefix="org.eclipse.emf.ecp.view.model">
<eClassifiers xsi:type="ecore:EClass" name="Diagnostic">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="diagnostics" upperBound="-1"
- eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
transient="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Attachment" abstract="true"/>
@@ -14,17 +14,17 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FeaturePathDomainModelReference" eSuperTypes="#//DomainModelReference">
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEFeature" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModelEReferencePath"
- upperBound="-1" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
+ upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Element" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="visible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
transient="true" defaultValueLiteral="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enabled" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
transient="true" defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="readonly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
defaultValueLiteral="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="diagnostic" eType="#//Diagnostic"
transient="true" containment="true"/>
@@ -33,11 +33,11 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="View" eSuperTypes="#//Element">
<eStructuralFeatures xsi:type="ecore:EReference" name="rootEClass" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
eType="#//ContainedElement" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="ecorePath" lowerBound="1"
- eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ContainedElement" abstract="true" eSuperTypes="#//Element"/>
<eClassifiers xsi:type="ecore:EClass" name="Container" abstract="true" eSuperTypes="#//Element">
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
index 11c0fdf..5d10914 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: IDEViewModelRegistry Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ide.view.service.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)",
org.eclipse.emf.edit;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.0.0,3.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
index 6b2db05..971b95c 100644
--- a/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ide.view.service.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ide.view.service.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
index 4087e3f..25b74d8 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.integrationtest/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Integrationtest
Bundle-SymbolicName: org.eclipse.emf.ecp.integrationtest
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.integrationtest.Activator
-Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
index 154881c..c62cd07 100644
--- a/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.integrationtest/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.integrationtest</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
index 9ca61c1..0198b61 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Model Quick Fix Test
Bundle-SymbolicName: org.eclipse.emf.ecp.quickfix.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
diff --git a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
index 0c62606..b9d23ea 100644
--- a/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.quickfix.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.quickfix.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
index 810d41b..2a9f998 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Test Model Edit Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.test.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.test.university.provider.UniversityEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
index a850054..60323f3 100644
--- a/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.edit/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.test.model.edit</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
index d9c4bf7..34eb417 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.test.model.feature"
label="ECP Test Model Feature"
- version="1.9.0.qualifier">
+ version="1.10.0.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
diff --git a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
index 0b06c4d..a2de174 100644
--- a/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.test.model.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
index 911eaaa..bac98e9 100644
--- a/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.test.model/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Test Model Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.test.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university;version="1.9.0",
- org.eclipse.emf.ecp.test.university.impl;version="1.9.0",
- org.eclipse.emf.ecp.test.university.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.test.university;version="1.10.0",
+ org.eclipse.emf.ecp.test.university.impl;version="1.10.0",
+ org.eclipse.emf.ecp.test.university.util;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.test.model/pom.xml b/tests/org.eclipse.emf.ecp.test.model/pom.xml
index e5aa6a6..3ff855a 100644
--- a/tests/org.eclipse.emf.ecp.test.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.test.model/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.test.model</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
index 3a6eaa8..c3a5244 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation View Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.validation.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
index 49ca934..7bb80f3 100644
--- a/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.validation.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.validation.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
index 71d719c..7435459 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.9.0",
- org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.10.0",
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
index 3c94311..54bf13b 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.editor.controls.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.view.editor.controls.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
index 48c1cda..2a70b39 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP String Modifier with Line Wrapping Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.linewrapper.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
index c3fa70c..2a25d5f 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.linewrapper.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.view.linewrapper.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
index d39face..e3462ae 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: SWT Renderer Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.test;version="1.9.0"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.test;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
index 465486a..5fcaa05 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.view.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
index 2f968f0..3eb1053 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.test
-Bundle-Version: 1.9.0.qualifier
-Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.9.0"
+Bundle-Version: 1.10.0.qualifier
+Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
org.eclipse.ui;bundle-version="3.104.0",
- org.eclipse.emf.ecp.explorereditorbridge;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.explorereditorbridge;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
index 2dc94e2..6494553 100644
--- a/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.ui.view.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.view.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
index 7a02687..f732d64 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Diagnostician Test
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.diagnostician.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
index c238dd2..25bc0c3 100644
--- a/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.diagnostician.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation.diagnostician.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
index 03898c2..66c709c 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.validation.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.util;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
org.eclipse.emf.ecore;bundle-version="2.8.0",
org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
index 4f7a3e2..282aaea 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
index 4110d5a..6f2c7de 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: Categorization Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.categorization.swt.test
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.9.0"
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.swt.layout;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
index e3b0be6..619b1db 100644
--- a/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.categorization.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.categorization.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
index e3ba8d7..f783344 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Compound Control SWT Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.compoundcontrol.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.9.0"
+Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
index 1562b32..ee63ff3 100644
--- a/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.compoundcontrol.swt.test/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.compoundcontrol.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
index e476577..9338b7d 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms View Model Context Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.context.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.context;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.context;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
index ba7051e..72160fc 100644
--- a/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.context.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.context.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
index 0e28517..b9f4105 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: Multi Reference Control Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.control.multireference.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.control.multireference;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.control.multireference;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
index 7563554..baace51 100644
--- a/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.control.multireference.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.control.multireference.tests</artifactId>
@@ -67,5 +67,5 @@
</plugins>
</build>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
index d40be85..5acd28b 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/META-INF/MANIFEST.MF
@@ -2,32 +2,32 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.core.swt.tests;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.3.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Import-Package: com.ibm.icu.text;version="52.1.1",
org.eclipse.swt.widgets;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
index 24da9bb..2ff98e7 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.core.swt.tests</artifactId>
@@ -62,5 +62,5 @@
</plugins>
</build>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
index c4445df..d272276 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,40 +2,40 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the Custom SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.ui.swt.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.custom.ui.swt.test.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
index cdaa82f..4a0bdf0 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.custom.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
index 206df92..ca56abe 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emf.ecp.view.dynamictree.feature"
label="Dynamic Tree Feature"
- version="1.9.0.qualifier"
+ version="1.10.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.view.dynamictree.model"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.9.0.qualifier">
+ license-feature-version="1.10.0.qualifier">
<description>
%description
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
index bb66595..480fa07 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.dynamictree.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
index eee6fe3..705d464 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dynamic Containment Tree Edit Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.edit;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.provider.DynamicTreeEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.10.0,2.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.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
index 85018ea..cebf010 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.edit/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.edit</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
index 938bf86..adaddc9 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dynamic Containment Tree Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.dynamictree.model.test.Activator
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.9.0";
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.10.0";
uses:="org.eclipse.emf.ecore,
org.eclipse.core.databinding,
org.eclipse.emf.ecp.view.context,
@@ -17,23 +17,23 @@
org.eclipse.emf.ecp.internal.ui.view.builders"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.junit;bundle-version="4.11.0",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.6.200,2.0.0)",
org.eclipse.swt;bundle-version="[3.102.1,4.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
index 9e13deb..d74e66d 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.dynamictree.model.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
index 1c55952..9cf1842 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dynamic Containment Tree Model Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.model;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.9.0",
- org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/dynamicContainmentTreeDMRConverter.xml
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore b/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore
index 8c3beeb..7bae1f7 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/model/dynamictree.ecore
@@ -6,9 +6,9 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="domainModel" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="childReference" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="pathToRoot" upperBound="-1"
- eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
+ eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="childComposite" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
@@ -21,24 +21,24 @@
eType="#//DynamicContainmentItem" transient="true" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="composite" eType="ecore:EClass ../../org.eclipse.emf.ecp.view.model/model/view.ecore#//ContainedElement"
containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseItemIndex" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EIntegerObject"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseItemIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"
transient="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TestElement" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject">
- <eOperations name="validate" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean">
- <eParameters name="diagnostic" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EDiagnosticChain"/>
+ <eClassifiers xsi:type="ecore:EClass" name="TestElement" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EObject">
+ <eOperations name="validate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eParameters name="diagnostic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain"/>
<eParameters name="context">
- <eGenericType eClassifier="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EMap">
+ <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
<eTypeArguments/>
<eTypeArguments/>
</eGenericType>
</eParameters>
</eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="elements" upperBound="-1"
eType="#//TestElement" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="parentId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DomainRoot">
<eStructuralFeatures xsi:type="ecore:EReference" name="intermediate" eType="#//DomainIntermediate"
@@ -51,7 +51,7 @@
<eClassifiers xsi:type="ecore:EClass" name="TestElementContainer">
<eStructuralFeatures xsi:type="ecore:EReference" name="testElements" upperBound="-1"
eType="#//TestElement" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DynamicContainmentTreeDomainModelReference"
eSuperTypes="../../org.eclipse.emf.ecp.view.model/model/view.ecore#//DomainModelReference">
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
index ddd6f13..54e869f 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.dynamictree.model</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
index 63bea83..861b5bf 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Dynamic Tree SWT UI
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui.swt;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.10.0,2.0.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
index 9f8fdde..24e1608 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui.swt/pom.xml
@@ -7,11 +7,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.dynamictree.ui.swt</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
index 2678a81..0f36319 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Dynamic Tree UI
Bundle-SymbolicName: org.eclipse.emf.ecp.view.dynamictree.ui;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
index 86c60ff..a125fe4 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.ui/pom.xml
@@ -7,11 +7,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.dynamictree.ui</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
index aed1258..47a8be9 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._140to170;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._160to170;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._140to170;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._160to170;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
index c4344e1..5d4eb5d 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.edapt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
index 90462a1..507a365 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/META-INF/MANIFEST.MF
@@ -2,42 +2,42 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.util.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.9.0",
- org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.10.0",
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.junit;bundle-version="[4.0.0,5.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
index 26ef6ae..116d5dc 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.edapt.util.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
index c41cb35..b05f5a3 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the Group SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.group.ui.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
index c1ddd2c..930e28d 100644
--- a/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.group.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.group.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
index ee2fa58..81def9f 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the Horizontal SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.horizontal.ui.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
index e9eb849..54602b6 100644
--- a/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.horizontal.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.horizontal.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
index 4a119a0..2370a78 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.indexdmr.model.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
index a5e34e3..31f40cd 100644
--- a/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.indexdmr.model.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.indexdmr.model.test</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
index 594b6a0..ed614a6 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.keyattributedmr.model.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.9.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.9.0",
- org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.10.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.10.0",
+ org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
index 63f66b7..5e78211 100644
--- a/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.keyattributedmr.model.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.keyattributedmr.model.test</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
index 3a8352f..767ece8 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.mappingdmr.model.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore
index 4379430..d19653d 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/model/example.ecore
@@ -27,7 +27,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="EClassToAdditionMap" instanceClassName="java.util.Map$Entry">
- <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="key" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//AbstractChild"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
index cad9d02..e7f2ff7 100644
--- a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.mappingdmr.model.test</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
index 014c0cb..4aa1bbf 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Common Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.9.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
index 7ab0c03..4633913 100644
--- a/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.common.test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
index 1bf22b3..edab8e8 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edit.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
index 9f6c8d1..6caf6e7 100644
--- a/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.edit.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.edit.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
index 36fb43c..08c6d2c 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.view.model.editor.test.feature"
label="View Model Editor Test Feature"
- version="1.9.0.qualifier">
+ version="1.10.0.qualifier">
<description>
Plugins for testing the View Model Editor with Q7.
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
index c7f10e7..2acef23 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.test.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.editor.test.feature</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
index 07e088a..0ff867b 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Editor Test Plugin for Q7
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.editor.testplugin;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
index 18c803c..2daa72f 100644
--- a/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.editor.testplugin/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.editor.testplugin</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
index bffb54a..60afe00 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: Integrationtest
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.integrationtest
-Bundle-Version: 1.9.0.qualifier
-Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
index 1aab71f..af6734e 100644
--- a/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.integrationtest/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.integrationtest</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
index 680011d..7a01374 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP XMI Provider Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.provider.xmi.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
org.junit;bundle-version="4.0.0",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
index b116e00..7d4f55e 100644
--- a/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.provider.xmi.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.model.provider.xmi.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
index f009e50..0971829 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.model.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Model Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.9.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
index e5cff05..fbaed6a 100644
--- a/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.model.test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
index 7fdacc1..eda6146 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Rule Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
index 53afd4e..684b15c 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.rule.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.test/src/org/eclipse/emf/ecp/view/rule/test/RuleRegistry_PTest.java b/tests/org.eclipse.emf.ecp.view.rule.test/src/org/eclipse/emf/ecp/view/rule/test/RuleRegistry_PTest.java
index a8d7cb3..edf9190 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.test/src/org/eclipse/emf/ecp/view/rule/test/RuleRegistry_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.rule.test/src/org/eclipse/emf/ecp/view/rule/test/RuleRegistry_PTest.java
@@ -550,8 +550,6 @@
// setup
final ShowRule rule = addFanMerchandiseOrRule(control1);
final OrCondition orCondition = (OrCondition) rule.getCondition();
- final Condition condition1 = orCondition.getConditions().get(0);
- final Condition condition2 = orCondition.getConditions().get(1);
// act
initialize();
@@ -566,32 +564,26 @@
final Entry<UniqueSetting, BidirectionalMap<Condition, ShowRule>> entry1 = iterator.next();
assertEquals(fanSetting, entry1.getKey());
final BidirectionalMap<Condition, ShowRule> conditionToRules1 = entry1.getValue();
- assertEquals(2, conditionToRules1.keys().size());
+ assertEquals(1, conditionToRules1.keys().size());
assertEquals(1, conditionToRules1.values().size());
- assertTrue(conditionToRules1.keys().contains(condition1));
- assertEquals(rule, conditionToRules1.getValue(condition1));
- assertTrue(conditionToRules1.keys().contains(condition2));
- assertEquals(rule, conditionToRules1.getValue(condition2));
+ assertTrue(conditionToRules1.keys().contains(orCondition));
+ assertEquals(rule, conditionToRules1.getValue(orCondition));
final Entry<UniqueSetting, BidirectionalMap<Condition, ShowRule>> entry2 = iterator.next();
assertEquals(merchandise1Setting, entry2.getKey());
final BidirectionalMap<Condition, ShowRule> conditionToRules2 = entry2.getValue();
- assertEquals(2, conditionToRules2.keys().size());
+ assertEquals(1, conditionToRules2.keys().size());
assertEquals(1, conditionToRules2.values().size());
- assertTrue(conditionToRules2.keys().contains(condition1));
- assertEquals(rule, conditionToRules2.getValue(condition1));
- assertTrue(conditionToRules2.keys().contains(condition2));
- assertEquals(rule, conditionToRules2.getValue(condition2));
+ assertTrue(conditionToRules2.keys().contains(orCondition));
+ assertEquals(rule, conditionToRules2.getValue(orCondition));
final Entry<UniqueSetting, BidirectionalMap<Condition, ShowRule>> entry3 = iterator.next();
assertEquals(merchandise2Setting, entry3.getKey());
final BidirectionalMap<Condition, ShowRule> conditionToRules3 = entry3.getValue();
- assertEquals(2, conditionToRules3.keys().size());
+ assertEquals(1, conditionToRules3.keys().size());
assertEquals(1, conditionToRules3.values().size());
- assertTrue(conditionToRules3.keys().contains(condition1));
- assertEquals(rule, conditionToRules3.getValue(condition1));
- assertTrue(conditionToRules3.keys().contains(condition2));
- assertEquals(rule, conditionToRules3.getValue(condition2));
+ assertTrue(conditionToRules3.keys().contains(orCondition));
+ assertEquals(rule, conditionToRules3.getValue(orCondition));
}
// assert rulesToRenderables
@@ -607,22 +599,16 @@
// assert conditionToSettings
{
final Map<Condition, Set<UniqueSetting>> conditionsToSettings = getConditionsToSettings();
- assertEquals(2, conditionsToSettings.size());
+ assertEquals(1, conditionsToSettings.size());
final Iterator<Entry<Condition, Set<UniqueSetting>>> iterator = conditionsToSettings.entrySet().iterator();
final Entry<Condition, Set<UniqueSetting>> entry1 = iterator.next();
- assertEquals(condition1, entry1.getKey());
+ assertEquals(orCondition, entry1.getKey());
assertEquals(3, entry1.getValue().size());
assertTrue(entry1.getValue().contains(fanSetting));
assertTrue(entry1.getValue().contains(merchandise1Setting));
assertTrue(entry1.getValue().contains(merchandise2Setting));
- final Entry<Condition, Set<UniqueSetting>> entry2 = iterator.next();
- assertEquals(condition2, entry2.getKey());
- assertEquals(3, entry2.getValue().size());
- assertTrue(entry2.getValue().contains(fanSetting));
- assertTrue(entry2.getValue().contains(merchandise1Setting));
- assertTrue(entry2.getValue().contains(merchandise2Setting));
}
}
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
index d6f799b..7daf6d5 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Rule Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule.ui.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
index 6a59e1a..9966742 100644
--- a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.rule.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
index 06b5735..6f39919 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Stack Model SWT Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
index 5514ecb..051037f 100644
--- a/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.stack.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.stack.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
index 62ee47f..f1abaa0 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table Model Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.9.0",
- org.eclipse.emf.ecp.view.table.model.test;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.10.0",
+ org.eclipse.emf.ecp.view.table.model.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
index 3acd1a6..3bdccea 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.table.model.test</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.model.test/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableDMRValidation_Test.java b/tests/org.eclipse.emf.ecp.view.table.model.test/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableDMRValidation_Test.java
index 8898e02..d5ee68c 100644
--- a/tests/org.eclipse.emf.ecp.view.table.model.test/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableDMRValidation_Test.java
+++ b/tests/org.eclipse.emf.ecp.view.table.model.test/src/org/eclipse/emf/ecp/view/spi/table/model/util/TableDMRValidation_Test.java
@@ -35,7 +35,6 @@
import org.eclipse.emf.ecp.view.spi.model.VView;
import org.eclipse.emf.ecp.view.spi.model.VViewFactory;
import org.eclipse.emf.ecp.view.spi.model.VViewPackage;
-import org.eclipse.emf.ecp.view.spi.model.util.ViewValidator;
import org.eclipse.emf.ecp.view.spi.table.model.VTableDomainModelReference;
import org.eclipse.emf.ecp.view.spi.table.model.VTableFactory;
import org.eclipse.emf.ecp.view.spi.table.model.VTablePackage;
@@ -339,7 +338,7 @@
assertFalse(validate());
if (createChain) {
assertEquals(Diagnostic.WARNING, chain.getSeverity());
- assertChain(controlDMRWarning(), tableColumns());
+ assertChain(tableColumns());
}
}
@@ -394,20 +393,6 @@
}
}
- @Test
- public void testBadRootEClassGoodRootEClassInContext() {
- okColumn1();
- okColumn2();
- okTable();
- view.setRootEClass(BowlingPackage.eINSTANCE.getFan());
- context.put(ViewValidator.ECLASS_KEY, BowlingPackage.eINSTANCE.getReferee());
- assertTrue(validate());
- if (createChain) {
- assertEquals(Diagnostic.OK, chain.getSeverity());
- assertChain();
- }
- }
-
private void assertChain(DiagnosticInfo... infos) {
final Set<DiagnosticInfo> infoSet = new LinkedHashSet<DiagnosticInfo>(Arrays.asList(infos));
assertEquals(infos.length, chain.getChildren().size());
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/All Tests for view.table.ui.swt.launch b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/All Tests for view.table.ui.swt.launch
index 0705181..2dbcee5 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/All Tests for view.table.ui.swt.launch
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/All Tests for view.table.ui.swt.launch
@@ -32,8 +32,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mockito.mockito-all@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common.test@default:false,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core.test@default:false,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt.test@default:false,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.ecp.test.common@default:default,org.eclipse.emf.ecp.test.model@default:default,org.eclipse.emf.ecp.ui.rcp@default:false,org.eclipse.emf.ecp.ui.view.swt.test@default:false,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view.test@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.view.context.tests@default:false,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.core.swt.tests@default:false,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.indexdmr.model@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common.test@default:false,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi.test@default:false,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model.test@default:false,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.model.test@default:false,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt.test@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service.test@default:false,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.test.common.swt@default:default,org.eclipse.emf.ecp.view.test.common@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation.test@default:false,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.rap.edit.ui.minimal@default:default,org.eclipse.emfforms.common.tests@default:false,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath.tests@default:false,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.index@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.index@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf.tests@default:false,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy.tests@default:false,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.index@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services.tests@default:false,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization.tests@default:false,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.tests@default:false,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.nebula.widgets.grid@default:default,org.eclipse.net4j.util@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.gtk.linux.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.mockito.mockito-core-hamcrest-modified@default:default,org.objenesis@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.0.v200806040011@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.ecp.common.test@default:false,org.eclipse.emf.ecp.common.ui@default:default,org.eclipse.emf.ecp.common@default:default,org.eclipse.emf.ecp.core.test@default:false,org.eclipse.emf.ecp.core@default:default,org.eclipse.emf.ecp.edit.swt.test@default:false,org.eclipse.emf.ecp.edit.swt@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.editor.e3@default:default,org.eclipse.emf.ecp.emfstore.core@default:default,org.eclipse.emf.ecp.explorereditorbridge@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.ecp.test.common@default:default,org.eclipse.emf.ecp.test.model@default:default,org.eclipse.emf.ecp.ui.rcp@default:false,org.eclipse.emf.ecp.ui.view.swt.test@default:false,org.eclipse.emf.ecp.ui.view.swt@default:default,org.eclipse.emf.ecp.ui.view.test@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.ui@default:default,org.eclipse.emf.ecp.view.context.tests@default:false,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.core.swt.tests@default:false,org.eclipse.emf.ecp.view.core.swt@default:default,org.eclipse.emf.ecp.view.indexdmr.model@default:default,org.eclipse.emf.ecp.view.label.model@default:default,org.eclipse.emf.ecp.view.migrator@default:default,org.eclipse.emf.ecp.view.model.common.test@default:false,org.eclipse.emf.ecp.view.model.common@default:default,org.eclipse.emf.ecp.view.model.provider.generator@default:default,org.eclipse.emf.ecp.view.model.provider.xmi.test@default:false,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model.test@default:false,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.ecp.view.swt.layout@default:default,org.eclipse.emf.ecp.view.table.columnservice@default:default,org.eclipse.emf.ecp.view.table.model.test@default:false,org.eclipse.emf.ecp.view.table.model@default:default,org.eclipse.emf.ecp.view.table.ui.swt.test@default:default,org.eclipse.emf.ecp.view.table.ui.swt@default:default,org.eclipse.emf.ecp.view.template.model@default:default,org.eclipse.emf.ecp.view.template.service.test@default:false,org.eclipse.emf.ecp.view.template.service@default:default,org.eclipse.emf.ecp.view.test.common.swt@default:default,org.eclipse.emf.ecp.view.test.common@default:default,org.eclipse.emf.ecp.view.util.swt@default:default,org.eclipse.emf.ecp.view.validation.test@default:false,org.eclipse.emf.ecp.view.validation@default:default,org.eclipse.emf.ecp.view.vertical.model@default:default,org.eclipse.emf.rap.edit.ui.minimal@default:default,org.eclipse.emfforms.common.tests@default:false,org.eclipse.emfforms.common@default:default,org.eclipse.emfforms.core.services.databinding.featurepath.tests@default:false,org.eclipse.emfforms.core.services.databinding.featurepath@default:default,org.eclipse.emfforms.core.services.databinding.index.tests@default:default,org.eclipse.emfforms.core.services.databinding.index@default:default,org.eclipse.emfforms.core.services.databinding.testmodel@default:default,org.eclipse.emfforms.core.services.domainexpander.default.tests@default:default,org.eclipse.emfforms.core.services.domainexpander.default@default:default,org.eclipse.emfforms.core.services.domainexpander.index.tests@default:default,org.eclipse.emfforms.core.services.domainexpander.index@default:default,org.eclipse.emfforms.core.services.domainexpander.table@default:default,org.eclipse.emfforms.core.services.editsupport@default:default,org.eclipse.emfforms.core.services.emf.tests@default:false,org.eclipse.emfforms.core.services.emf@default:default,org.eclipse.emfforms.core.services.emfspecificservice@default:default,org.eclipse.emfforms.core.services.legacy.tests@default:false,org.eclipse.emfforms.core.services.legacy@default:default,org.eclipse.emfforms.core.services.locale.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.default@default:default,org.eclipse.emfforms.core.services.mappingprovider.table@default:default,org.eclipse.emfforms.core.services.structuralchange.default@default:default,org.eclipse.emfforms.core.services.structuralchange.index@default:default,org.eclipse.emfforms.core.services.structuralchange.table@default:default,org.eclipse.emfforms.core.services.structuralchange@default:default,org.eclipse.emfforms.core.services.tests@default:false,org.eclipse.emfforms.core.services@default:default,org.eclipse.emfforms.localization.tests@default:false,org.eclipse.emfforms.localization@default:default,org.eclipse.emfforms.swt.core.di@default:default,org.eclipse.emfforms.swt.core.tests@default:false,org.eclipse.emfforms.swt.core@default:default,org.eclipse.emfforms.swt.table@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
index b7fb1d3..e349496 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,41 +2,41 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the Group SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.9.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.10.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
org.eclipse.equinox.registry;bundle-version="[3.5.400,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.10.0,4.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.common;bundle-version="[2.10.0,3.0.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.4.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.11.1,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.10.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
index f1a863f..140dd09 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.table.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/SWTTable_PTest.java b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/SWTTable_PTest.java
index 605bfb8..d8d3816 100644
--- a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/SWTTable_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/src/org/eclipse/emf/ecp/view/table/ui/swt/test/SWTTable_PTest.java
@@ -527,7 +527,7 @@
eclipseContext.get(EMFFormsEditSupport.class)) {
@Override
- protected CellEditor createCellEditor(EObject tempInstance, EStructuralFeature feature, Table table) {
+ protected CellEditor createCellEditor(EObject tempInstance, EStructuralFeature feature, Composite table) {
if (feature == EcorePackage.eINSTANCE.getENamedElement_Name()) {
return new CompareCellEditor(table);
}
@@ -879,7 +879,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.ecp.view.spi.context.ViewModelContext#getParentContext()
*/
@Override
@@ -890,7 +890,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emfforms.spi.core.services.view.EMFFormsViewContext#changeDomainModel(org.eclipse.emf.ecore.EObject)
*/
@Override
@@ -901,7 +901,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emfforms.spi.core.services.view.EMFFormsViewContext#registerRootDomainModelChangeListener(org.eclipse.emfforms.spi.core.services.view.RootDomainModelChangeListener)
*/
@Override
@@ -912,7 +912,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emfforms.spi.core.services.view.EMFFormsViewContext#unregisterRootDomainModelChangeListener(org.eclipse.emfforms.spi.core.services.view.RootDomainModelChangeListener)
*/
@Override
@@ -924,7 +924,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.ecp.view.spi.context.ViewModelContext#getParentVElement()
*/
@Override
@@ -958,7 +958,7 @@
private static class CompareCellEditor extends StringCellEditor implements ECPCellEditorComparator {
- CompareCellEditor(Table table) {
+ CompareCellEditor(Composite table) {
super(table);
}
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
index 2d7c665..e4668a3 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Template Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.service.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.9.0,2.0.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.emf.edit.domain;version="0.0.0",
org.eclipse.emf.edit.provider;version="0.0.0"
diff --git a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
index e6d73b4..74c90f7 100644
--- a/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.template.service.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.template.service.test</artifactId>
<packaging>eclipse-test-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
index acf24ff..96edf41 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: Helper Class for the SWT View Model Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common.swt
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.10.0"
Require-Bundle: org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
index e3d9dcd..1cc9cfa 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.test.common.swt</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
index 66d9096..10bce23 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.test.common/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common Test Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.view.test.common
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.10.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
index 69c78d9..d11774b 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.test.common/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emf.ecp.view.test.common</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
index 2a8a944..90249a1 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the TreeMasterDetail Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
index dd97f83..cfd682c 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test/pom.xml
@@ -5,13 +5,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
index 8521582..9441d34 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms TreeMasterDetail Validation Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
index 152dc4e..ad6bef8 100644
--- a/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.treemasterdetail.validation.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.treemasterdetail.validation.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
index 81b067a..7b55c5e 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/META-INF/MANIFEST.MF
@@ -2,39 +2,39 @@
Bundle-ManifestVersion: 2
Bundle-Name: Editor SWTBot Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.ui.editor.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.view.ui.editor.test.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.9.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
- org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.10.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
+ org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.swtbot.eclipse.finder;bundle-version="[2.1.1,3.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="4.11.0",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="3.102.0",
org.eclipse.swtbot.junit4_x;bundle-version="2.1.1",
org.eclipse.jface.databinding;bundle-version="1.6.200",
org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.10.0,2.0.0)",
org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
index 909b892..5a4b7c1 100644
--- a/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.ui.editor.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.ui.editor.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
index 0eed949..1ccd92d 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Unset Service Test
Bundle-SymbolicName: org.eclipse.emf.ecp.view.unset.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.unset;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.unset;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
index 22335d2..abb2d5c 100644
--- a/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.unset.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.unset.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
<sourceDirectory>src</sourceDirectory>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
index 8241367..d9de553 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .,
lib/commons-beanutils-1.9.2.jar,
lib/commons-lang3-3.3.2.jar,
lib/org.apache.bval.bundle-0.5.jar
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: car;version="1.9.0";x-internal:=true,
- car.impl;version="1.9.0";x-internal:=true,
- car.util;version="1.9.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean.test;version="1.9.0";x-internal:=true
+Export-Package: car;version="1.10.0";x-internal:=true,
+ car.impl;version="1.10.0";x-internal:=true,
+ car.util;version="1.10.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean.test;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
index f6d0ea8..0395dc0 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.bean.test/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation.bean.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
index eb0f0b5..b9859b9 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.test;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.9.0,2.0.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.9.0",
- org.eclipse.emf.ecp.view.validation.test.model;version="1.9.0",
- org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.9.0",
- org.eclipse.emf.ecp.view.validation.test.model.util;version="1.9.0"
+Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.10.0",
+ org.eclipse.emf.ecp.view.validation.test.model;version="1.10.0",
+ org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.10.0",
+ org.eclipse.emf.ecp.view.validation.test.model.util;version="1.10.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
index 3777ed5..f650d48 100644
--- a/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.validation.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.validation.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
index 81cac5d..15caed4 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for the VerticalSWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.view.vertical.ui.swt.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.9.0,2.0.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
index 843711d..ca9dcb3 100644
--- a/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.vertical.ui.swt.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.vertical.ui.swt.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
index ff53a72..f58db5c 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewProxy Tests
Bundle-SymbolicName: org.eclipse.emf.ecp.view.viewproxy.tests;singleton:=true
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.9.0",
- org.eclipse.emf.ecp.view.viewproxy.tests;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.10.0",
+ org.eclipse.emf.ecp.view.viewproxy.tests;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
index 32e81b8..4153137 100644
--- a/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
+++ b/tests/org.eclipse.emf.ecp.view.viewproxy.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.view.viewproxy.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
index 716179e..ed1d19f 100644
--- a/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.common.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Locale Tests
Bundle-SymbolicName: org.eclipse.emfforms.common.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.common.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.common.locale;version="1.9.0"
+Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.common.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common.locale;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.common.tests/pom.xml b/tests/org.eclipse.emfforms.common.tests/pom.xml
index cbbb9b4..688252b 100644
--- a/tests/org.eclipse.emfforms.common.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.common.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.common.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
index 28e2927..b76b818 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Databinding Services Featurepath Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.featurepath.tests;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
index 4828c39..8403700 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.featurepath.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.databinding.featurepath.tests</artifactId>
@@ -42,5 +42,5 @@
</plugins>
</build>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
index ac563ec..564bcda 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Converter Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.index;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.index;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0]"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
index 31eb206..4723014 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.index.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.databinding.index.tests</artifactId>
@@ -27,5 +27,5 @@
</plugins>
</build>
<groupId>org.eclipse.emfforms</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
index 0e06003..5f28ca4 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Databinding Services Integration Test
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.integrationtest
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.1.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
index 6c3299b..3b34859 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.integrationtest/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.databinding.integrationtest</artifactId>
@@ -52,5 +52,5 @@
</plugins>
</build>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
index e108577..2daaf09 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute DMR Converter Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.keyattribute.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.9.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 1.10.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.9.0";x-internal:=true
-Bundle-Vendor: Eclipse Modeling Project
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
index fe34076..7191959 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.databinding.keyattribute.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
index 8f76343..3001a25 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Converter Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
index e81d8e7..ce12705 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.mapping.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.databinding.mapping.tests</artifactId>
@@ -27,5 +27,5 @@
</plugins>
</build>
<groupId>org.eclipse.emfforms</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
index 69050a6..a87bcdf 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.testmodel;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.9.0",
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.9.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.10.0",
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.10.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
index 773eb78..90648a1 100644
--- a/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.databinding.testmodel/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<artifactId>org.eclipse.emfforms.core.services.databinding.testmodel</artifactId>
<packaging>eclipse-plugin</packaging>
<groupId>org.eclipse.emf.ecp</groupId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
index 5840411..5ea34e4 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default Domain Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.default.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
index 6428aa8..96d5b9b 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.default.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.default.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
index 64eaddb..594227f 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.index.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
index 1351a0b..a11c6ef 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.index.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.index.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
index 17097b1..580baf2 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute DMR Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.9.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.9.0";x-internal:=true
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
index dd9e5462..b4dd0ff 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
index e37074a..89047d4 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Expander Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.domainexpander.mapping.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
diff --git a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
index a1bd185..e79b102 100644
--- a/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.domainexpander.mapping.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.domainexpander.mapping.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
index 7ace180..547a0d7 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Service EMF Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.emf.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
index 85548b9..2930054 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.emf.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
index 2780cc1..bdc7eb0 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services Legacy Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.legacy.tests;singleton:=true
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.legacy;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.legacy;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.common;version="[1.9.0,2.0.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.10.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
index 7e99771..d586691 100644
--- a/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.legacy.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.legacy.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
index 501dd86..0f2c6b1 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Key Attribute Structural Change Tester Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.9.0,2.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.common;bundle-version="[2.11.0,3.0.0)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.9.0";x-internal:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
index b49826b..632fc9f 100644
--- a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
index ea0f547..c5e348d 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.core.services.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Core Services Tests
Bundle-SymbolicName: org.eclipse.emfforms.core.services.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.core.services.scoped;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.tests;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.scoped;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.tests;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.eclipse.equinox.ds;bundle-version="[1.4.300,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.core.services.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
index c7ab38f..d746902 100644
--- a/tests/org.eclipse.emfforms.core.services.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.core.services.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.core.services.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
index f5a6bf5..2d4bf05 100644
--- a/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.localization.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms Localization Tests
Bundle-SymbolicName: org.eclipse.emfforms.localization.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.9.0"
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.10.0"
Require-Bundle: org.junit;bundle-version="4.11.0",
org.mockito.mockito-core-hamcrest-modified;bundle-version="1.9.5",
org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.localization.tests/pom.xml b/tests/org.eclipse.emfforms.localization.tests/pom.xml
index 2056cca..407b0f7 100644
--- a/tests/org.eclipse.emfforms.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.localization.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.localization.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
index 5c0a4e6..39c6d9f 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Text Control with Autocomplete Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.autocomplete.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.9.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.10.0,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
index 7b140ce..e892ef3 100644
--- a/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.control.text.autocomplete.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.control.text.autocomplete.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
index cddc2c0..d185ffa 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Control Grid SWT Renderer Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.controlgrid.test
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.9.0"
+Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
index 4df89aa..0e9c3c4 100644
--- a/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.controlgrid.test/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.controlgrid.test</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
index 7540cc7..13ffdfc 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: SWT Core DI Extension Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.extension.tests;singleton:=true
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.9.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
+Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.10.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)"
diff --git a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
index 8a7f1c1..6821dd7 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.extension.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.core.di.extension.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
index bd87cb4..bf598c0 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core DI Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.di.tests
-Bundle-Version: 1.9.0.qualifier
+Bundle-Version: 1.10.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.9.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
- org.eclipse.emfforms.spi.swt.core.di;version="1.9.0"
-Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.9.0,2.0.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.10.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
+ org.eclipse.emfforms.spi.swt.core.di;version="1.10.0"
+Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.10.0,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
diff --git a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
index d286c55..c844789 100644
--- a/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.di.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.core.di.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
index e8da51b..51cd021 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.swt.core.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core Tests
Bundle-SymbolicName: org.eclipse.emfforms.swt.core.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.9.0,2.0.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.swt.core.tests;version="1.9.0";x-internal:=true
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.10.0,2.0.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.swt.core.tests;version="1.10.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
index 31b8588..7ac12ec 100644
--- a/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.swt.core.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.swt.core.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
index b6f2bb5..0b5f28b 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms View Model Localization Tests
Bundle-SymbolicName: org.eclipse.emfforms.view.model.localization.tests
-Bundle-Version: 1.9.0.qualifier
-Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.9.0,2.0.0)"
+Bundle-Version: 1.10.0.qualifier
+Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.10.0,2.0.0)"
Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.9.0";x-internal:=true,
- org.eclipse.emfforms.view.model.localization.tests;version="1.9.0"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.10.0";x-internal:=true,
+ org.eclipse.emfforms.view.model.localization.tests;version="1.10.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.equinox.ds;bundle-version="[1.4.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.localization;version="[1.9.0,2.0.0)"
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.10.0,2.0.0)"
diff --git a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
index dc07238..b444f92 100644
--- a/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
+++ b/tests/org.eclipse.emfforms.view.model.localization.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-tests-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.tests/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emfforms.view.model.localization.tests</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.10.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/META-INF/MANIFEST.MF
index d1150a5..c4134b4 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.spreadsheet.core.renderer.categorization;bundle-version="[1.0.0,2.0.0)"
+Fragment-Host: org.eclipse.emfforms.spreadsheet.core.renderer.categorization;bundle-version="[1.0.0,1.1.0)"
Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.categorization;version="1.0.0";x-internal:=true,
org.eclipse.emfforms.spreadsheet.core.renderer.categorization.tests;version="1.0.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
index d859b77..9c95b11 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.renderer.table.tests/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@
Fragment-Host: org.eclipse.emfforms.spreadsheet.core.renderer.table;bundle-version="[1.0.0,2.0.0)"
Export-Package: org.eclipse.emfforms.internal.spreadsheet.core.renderer.table;version="1.0.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.9.0,2.0.0)"
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.10.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
index b697916..c02df35 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.core.tests/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@
org.eclipse.emfforms.spreadsheet.core.tests;version="1.0.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
index 5af79f1..9476f16 100644
--- a/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
+++ b/tests/spreadsheet/org.eclipse.emfforms.spreadsheet.integrationtest/META-INF/MANIFEST.MF
@@ -8,13 +8,13 @@
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.11.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.11.0,3.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.10.0,2.0.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
org.eclipse.emf.emfstore.examplemodel.edit;bundle-version="[1.5.0,2.0.0)",
org.eclipse.emfforms.spreadsheet.core.error.model;bundle-version="[1.0.0,2.0.0)"
