Merge branch 'release_1.12.0'
# Conflicts:
# features/org.eclipse.emf.ecp.all.feature/feature.xml
Change-Id: I99aa832e3f851fa3e5e51c0f8c55b5b4964e1e76
Signed-off-by: Eugen Neufeld <eneufeld@eclipsesource.com>
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 2739b95..6dddf11 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.application3x;version="1.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.12.0,1.13.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 58374b5..36344a9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 70cbf5f..4feae06 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.application.e4.editor;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.e4;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 d5622ae..f123e06 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c465a96..93511ba 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
+Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.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 a972413..cdd33a1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a734520..33b904f 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.cdo.internal.ui;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.cdo.internal.ui.handlers;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.cdo.core;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.cdo.core;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.cdo.edit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.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 f5fd9bc..2a01f7b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 16e51fc..59c7841 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.internal;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.changebroker;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.common;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.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 f7cf048..dfe74d8 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ddabf8f..fa8e442 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.changebroker.spi;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.changebroker.internal;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.changebroker.spi;version="1.12.0"
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 2bbd231..c692059 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 42f96e4..6b21e58 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.common.ui;version="1.11.0",
- org.eclipse.emf.ecp.spi.common.ui.composites;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.internal.common.ui;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.common.ui;version="1.12.0",
+ org.eclipse.emf.ecp.spi.common.ui.composites;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)"
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 a713299..0e00d63 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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/CompositeFactory.java b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/CompositeFactory.java
index 30cb5ca..659e865 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/CompositeFactory.java
+++ b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/CompositeFactory.java
@@ -15,6 +15,7 @@
import java.util.HashSet;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecp.spi.common.ui.composites.CheckedEStructuralFeatureComposite;
import org.eclipse.emf.ecp.spi.common.ui.composites.CheckedEStructuralFeatureCompositeImpl;
@@ -47,7 +48,9 @@
/**
* Creates a {@link SelectionComposite} to select an {@link EClass}.
*
- *
+ * @param unsupportedEPackages {@link EPackage EPackages} that are not supported and will not be shown
+ * @param filteredEPackages {@link EPackage EPackages} to be shown
+ * @param filteredEClasses {@link EClass EClasses} to be shown
* @return {@link SelectionComposite}
*/
public static SelectionComposite<TreeViewer> getSelectModelClassComposite(
@@ -57,9 +60,15 @@
}
/**
+ * Creates a {@link SelectionComposite} with a {@link TableViewer} to select an {@link EObject}.
+ *
+ * @param rootObject The children of this object are shown in the table.
+ * @param multiSelection Whether the user can select multiple {@link EObject}s
+ * @return a {@link SelectionComposite}
* @since 1.5
*/
- public static SelectionComposite<TableViewer> getTableSelectionComposite(Object rootObject, boolean multiSelection) {
+ public static SelectionComposite<TableViewer> getTableSelectionComposite(Object rootObject,
+ boolean multiSelection) {
return new SelectModelElementCompositeImpl(rootObject, multiSelection);
}
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/AbstractEClassTreeSelectionComposite.java b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/AbstractEClassTreeSelectionComposite.java
index 8e47489..726d675 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/AbstractEClassTreeSelectionComposite.java
+++ b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/AbstractEClassTreeSelectionComposite.java
@@ -44,9 +44,9 @@
/**
* Constructor setting the necessary data for selecting the {@link EClass EClasses}.
*
- * @param unsupportedEPackages {@link EPackage EPackages} that are not supported
- * @param filteredEPackages {@link EPackage EPackages} selected by the user
- * @param filteredEClasses {@link EClass EClasses} selected by the user
+ * @param unsupportedEPackages {@link EPackage EPackages} that are not supported and will not be shown
+ * @param filteredEPackages {@link EPackage EPackages} to be shown
+ * @param filteredEClasses {@link EClass EClasses} to be shown
*/
public AbstractEClassTreeSelectionComposite(Collection<EPackage> unsupportedEPackages,
Collection<EPackage> filteredEPackages, Collection<EClass> filteredEClasses) {
diff --git a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/SelectModelElementCompositeImpl.java b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/SelectModelElementCompositeImpl.java
index e45df26..4c12b13 100644
--- a/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/SelectModelElementCompositeImpl.java
+++ b/bundles/org.eclipse.emf.ecp.common.ui/src/org/eclipse/emf/ecp/spi/common/ui/composites/SelectModelElementCompositeImpl.java
@@ -147,6 +147,7 @@
final Matcher matcher = pattern.matcher(eObjectName);
return matcher.matches();
}
+ // BEGIN COMPLEX CODE
private String wildcardToRegex(String wildcard) {
final StringBuffer s = new StringBuffer(wildcard.length());
@@ -185,6 +186,7 @@
}
s.append('$');
return s.toString();
+ // END COMPLEX CODE
}
}
}
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 46be2d2..9dac52b 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.11.0",
- org.eclipse.emf.ecp.common.spi.asserts;version="1.11.0",
- org.eclipse.emf.ecp.common.spi.cachetree;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.12.0",
+ org.eclipse.emf.ecp.common.spi.asserts;version="1.12.0",
+ org.eclipse.emf.ecp.common.spi.cachetree;version="1.12.0"
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 0deaa7c..6385e7f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
index eb85887..bbc0322 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.emffilter.internal;version="1.12.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.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 56beaac..756f065 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.rap.sessionprovider.rwt/META-INF/MANIFEST.MF
index e36101f..dfa2ef3 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.rwt;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.servlet.http;version="0.0.0",
- org.eclipse.emf.ecp.core.rap;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.12.0,1.13.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 e13ce16..772d535 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d145d0c..f6ed59f 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.core.rap;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.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 0955062..4a2fe0c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 3732f1f..f34c5f5 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0",
- org.eclipse.emf.ecp.core.exceptions;version="1.11.0",
- org.eclipse.emf.ecp.core.util;version="1.11.0",
- org.eclipse.emf.ecp.core.util.observer;version="1.11.0",
- org.eclipse.emf.ecp.internal.core;version="1.11.0";
+Export-Package: org.eclipse.emf.ecp.core;version="1.12.0",
+ org.eclipse.emf.ecp.core.exceptions;version="1.12.0",
+ org.eclipse.emf.ecp.core.util;version="1.12.0",
+ org.eclipse.emf.ecp.core.util.observer;version="1.12.0",
+ org.eclipse.emf.ecp.internal.core;version="1.12.0";
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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.core.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.ui",
- org.eclipse.emf.ecp.internal.core.util.observer;version="1.11.0";x-friends:="org.eclipse.emf.ecp.core.rap",
- org.eclipse.emf.ecp.spi.core;version="1.11.0",
- org.eclipse.emf.ecp.spi.core.util;version="1.11.0"
+ org.eclipse.emf.ecp.internal.core.properties;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.core.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui",
+ org.eclipse.emf.ecp.internal.core.util.observer;version="1.12.0";x-friends:="org.eclipse.emf.ecp.core.rap",
+ org.eclipse.emf.ecp.spi.core;version="1.12.0",
+ org.eclipse.emf.ecp.spi.core.util;version="1.12.0"
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.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 fd18c53..d589293 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 9f8aa3e..1cc6289 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diagnostician;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4,org.eclipse.emf.ecp.ui.validation.test",
+ org.eclipse.emf.ecp.internal.diagnostician;version="1.12.0";x-internal:=true
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 106003b..0a9f0b0 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 69d8879..963195c 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.diffmerge.spi.context;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.context;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.diffmerge.spi.context;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)"
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 5d23ec7..f880b2c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.model.edit/META-INF/MANIFEST.MF
index 25436c2..8474c4d 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model.provider;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 073c1fe..fc3eb62 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 20ae466..0b19ac2 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.11.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.spi.diffmerge.model;version="1.12.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.spi.diffmerge.model.util;version="1.12.0"
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 cd522dd..50f8541 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c17f5ab..ab3be57 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.diffmerge.internal.renderer.swt;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.diffmerge.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.diffmerge.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
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 079d840..90740a3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.diffmerge.swt/META-INF/MANIFEST.MF
index ee7482d..d69cff9 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.diffmerge.renderer.swt"
+Export-Package: org.eclipse.emf.ecp.diffmerge.swt;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
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 a1491fe..530a5fd 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d3cd344..6e8f392 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.11.0.qualifier
+Bundle-Version: 1.12.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 3c4a5dc..14b5fec 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d7aab75c..3fb76dc 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.12.0,1.13.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 652a8b3..bf235f7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 635271f..1c7fb32 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.11.0.qualifier
+Bundle-Version: 1.12.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 0b3ae10..8457001 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a14e1c0..3b138ae 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,14 +2,14 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.ecore.swt.internal;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml b/bundles/org.eclipse.emf.ecp.edit.ecore.swt/pom.xml
index 4e5373b..1b7a567 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters
index 523b022..dcc4566 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/.api_filters
@@ -55,6 +55,12 @@
</filter>
</resource>
<resource path="src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCellEditor.java" type="org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor">
+ <filter comment="SPI Change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor"/>
+ <message_argument value="COPY_STRING_ALTERNATIVE"/>
+ </message_arguments>
+ </filter>
<filter comment="SPI change" id="403804204">
<message_arguments>
<message_argument value="org.eclipse.emf.ecp.edit.spi.swt.table.ECPCellEditor"/>
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 1499ee9..07f8d97 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.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.11.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.11.0";
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.edit.internal.swt.actions;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.edit.ecore.swt",
+ org.eclipse.emf.ecp.edit.internal.swt.controls;version="1.12.0";
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.11.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.11.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.11.0";
+ org.eclipse.emf.ecp.edit.internal.swt.reference;version="1.12.0";x-friends:="org.eclipse.emf.ecp.edit.ecore.swt,org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.edit.internal.swt.table;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt,org.eclipse.emfforms.swt.control.multiattribute",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="1.12.0";
x-friends:="org.eclipse.emf.ecp.editor,
org.eclipse.emf.ecp.explorereditorbridge,
org.eclipse.emf.ecp.ui.view.swt,
@@ -25,25 +25,25 @@
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.11.0",
- org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.11.0",
- org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.11.0",
- org.eclipse.emf.ecp.edit.spi.swt.table;version="1.11.0",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="1.11.0"
+ org.eclipse.emf.ecp.edit.spi.swt.actions;version="1.12.0",
+ org.eclipse.emf.ecp.edit.spi.swt.commands;version="1.12.0",
+ org.eclipse.emf.ecp.edit.spi.swt.reference;version="1.12.0",
+ org.eclipse.emf.ecp.edit.spi.swt.table;version="1.12.0",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.fieldassist;version="0.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml b/bundles/org.eclipse.emf.ecp.edit.swt/pom.xml
index 0ae3481..4741141 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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/util/DialogWrapper.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/DialogWrapper.java
index cf16c66..6fd7a17 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/DialogWrapper.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/DialogWrapper.java
@@ -29,5 +29,5 @@
* @param dialog the JFace {@link Dialog}
* @param callBack the {@link ECPDialogExecutor} called
*/
- void openDialog(final Dialog dialog, final ECPDialogExecutor callBack);
+ void openDialog(Dialog dialog, ECPDialogExecutor callBack);
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPControlSWT.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPControlSWT.java
index 9194568..86f1836 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPControlSWT.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPControlSWT.java
@@ -31,5 +31,5 @@
* @param parent the {@link Composite} to render onto
* @return the list of {@link RenderingResultRow RenderingResultRows}
*/
- List<RenderingResultRow<Control>> createControls(final Composite parent);
+ List<RenderingResultRow<Control>> createControls(Composite parent);
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCellEditor.java
index c2aa485..ff931a4 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/spi/swt/table/ECPCellEditor.java
@@ -39,6 +39,8 @@
/**
* Indicator for an alternative copy string.
+ *
+ * @since 1.11
*/
String COPY_STRING_ALTERNATIVE = "org.eclipse.emf.ecp.edit.spi.swt.table.copyStringAlternative"; //$NON-NLS-1$
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 0e452fc..95f6311 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0",
- org.eclipse.emf.ecp.edit.spi.util;version="1.11.0",
- org.eclipse.emf.ecp.internal.edit;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.edit.spi;version="1.12.0",
+ org.eclipse.emf.ecp.edit.spi.util;version="1.12.0",
+ org.eclipse.emf.ecp.internal.edit;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emf.ecp.view.model.common.edit.provider;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
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 cdc7d43..f4227c4 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
index 2c8b5c4..af1f7ef 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.editor.internal.e3;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.editor.e3;version="1.12.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.editor.internal.e3;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
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.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 12979bd..73a6d14 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e55da7d..a0cb2c6 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
@@ -12,11 +12,11 @@
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/about.html b/bundles/org.eclipse.emf.ecp.emf2web.json/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/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.emf2web.json/build.properties b/bundles/org.eclipse.emf.ecp.emf2web.json/build.properties
index d8e2f0e..0ca040a 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/build.properties
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/build.properties
@@ -2,4 +2,6 @@
xtend-gen/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ about.html
+src.includes = about.html
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.json/pom.xml
index 164d6fd..a43765e 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.json/src/org/eclipse/emf/ecp/emf2web/json/generator/FormsJsonGenerator.xtend b/bundles/org.eclipse.emf.ecp.emf2web.json/src/org/eclipse/emf/ecp/emf2web/json/generator/FormsJsonGenerator.xtend
index c528681..8039793 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.json/src/org/eclipse/emf/ecp/emf2web/json/generator/FormsJsonGenerator.xtend
+++ b/bundles/org.eclipse.emf.ecp.emf2web.json/src/org/eclipse/emf/ecp/emf2web/json/generator/FormsJsonGenerator.xtend
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014-2015 EclipseSource Muenchen GmbH and others.
+ * Copyright (c) 2014-2017 EclipseSource Muenchen GmbH and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
@@ -109,7 +109,7 @@
val jsonObject = new JsonObject
jsonObject.withType(container.type)
if(container.name!=null) {
- jsonObject.withLabel(container.label)
+ jsonObject.withLabel(container.label.displayLabel)
}
jsonObject.withElements(container.children)
}
@@ -154,4 +154,23 @@
refHelper.getLabel(control.domainModelReference)
}
+ private def String getDisplayLabel(String containerLabel){
+ if(containerLabel.trim.startsWith("%")){
+ var label = containerLabel.trim.substring(1);
+ val split = label.split("(?<!(^|[A-Z]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])"); //$NON-NLS-1$
+ if(split.get(0).length > 0){
+ val charArray = split.get(0).toCharArray();
+ charArray.set(0, Character.toUpperCase(charArray.get(0)))
+ split.set(0, new String(charArray))
+ }
+ val sb = new StringBuilder();
+ for (str : split) {
+ sb.append(str);
+ sb.append(" "); //$NON-NLS-1$
+ }
+ return sb.toString.trim;
+ }
+ containerLabel
+ }
+
}
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 9f752a8..0db7f45 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
@@ -13,9 +13,9 @@
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecp.emf2web;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.emf2web.json;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/about.html b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/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.emf2web.ui.json/build.properties b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/build.properties
index 6c480f3..461e561 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/build.properties
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/build.properties
@@ -3,4 +3,6 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- icons/
+ icons/,\
+ about.html
+src.includes = about.html
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/plugin.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/plugin.xml
index 0019cc3..180213d 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui.json/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui.json/plugin.xml
@@ -6,14 +6,14 @@
<command
defaultHandler="org.eclipse.emf.ecp.emf2web.ui.json.internal.handler.ExportJSONFormsHandler"
id="org.eclipse.emf.ecp.emf2web.ui.json.exportJSONSchemaCommand"
- name="Export to JSONForms">
+ name="Export to JSON Forms">
</command>
</extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
allPopups="true"
- locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">
+ locationURI="popup:org.eclipse.ui.popup.any">
<menu
id="org.eclipse.emf.ecp.ui.e3.emfFormsMenu"
label="EMF Forms">
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 148a6fe..c28ac6d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 cf5d83b..4b752bc 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
@@ -15,9 +15,9 @@
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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.core.resources;bundle-version="[3.10.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.11.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.databinding.swt;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/about.html b/bundles/org.eclipse.emf.ecp.emf2web.ui/about.html
new file mode 100644
index 0000000..d35d5ae
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/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.emf2web.ui/build.properties b/bundles/org.eclipse.emf.ecp.emf2web.ui/build.properties
index 34d2e4d..9cbab3c 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web.ui/build.properties
+++ b/bundles/org.eclipse.emf.ecp.emf2web.ui/build.properties
@@ -1,4 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ about.html
+src.includes = about.html
diff --git a/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emf2web.ui/pom.xml
index eca43c8..534f410 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2ff447b..a10b90b 100644
--- a/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emf2web/META-INF/MANIFEST.MF
@@ -25,24 +25,24 @@
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.12.0,1.13.0)",
com.google.gson;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.emfstore.common.model;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.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 834d3a7..437fe6a 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
index 69c6b89..1e4ebe0 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore Core RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core.rap
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.core.rap;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.rap.rwt;version="0.0.0",
org.eclipse.rap.rwt.service;version="0.0.0"
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core.rap/pom.xml
index 9f1a156..0a377cd 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2cff0b1..6ab4290 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";
+Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.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 032dff2..99155fc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 b718971..8a672a2 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.11.0";x-internal:=true;uses:="org.eclipse.core.commands"
-Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui.decorator;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.e3;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.12.0";x-internal:=true;uses:="org.eclipse.core.commands"
+Require-Bundle: org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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 d91e820..4bec99a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2402427..ffb3c14 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.e4.emfstore;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.emfstore.ui;bundle-version="[1.12.0,1.13.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 7a14d12..cf7a294 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 954ac56..0804e21 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.ui.search;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.e3;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.e3;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.emfstore.client;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.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 d5eb969..f4dc8a9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e93c690..9beafdb 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.11.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.emfstore.internal.ui;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.handler;version="1.12.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui.e4,org.eclipse.emf.ecp.emfstore.ui.e3",
+ org.eclipse.emf.ecp.emfstore.internal.ui.observer;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.emfstore.internal.ui.property;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.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 852cb0a..76a2ab1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2072013..d6c4013 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
+Require-Bundle: org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.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 650bc8e..06cd247 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 9dab940..370bc8b 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.ui.view.test"
+Export-Package: org.eclipse.emf.ecp.explorereditorbridge.internal;version="1.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.editor.e3;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.editor.e3;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
- org.eclipse.emf.ecp.edit.internal.swt;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.internal.swt;version="[1.12.0,1.13.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 b9c9438..dd235ea 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 78226df..7e11a5f 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view.templatebridge/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.internal.ide.editor.view.templatebridge.actions;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.tooling;bundle-version="[1.12.0,1.13.0)"
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 6ac39e9..362bd45 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 934c5d0..62a21fe 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
- org.eclipse.emf.ecp.ide.editor.view.messages;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.editor.view;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3",
+ org.eclipse.emf.ecp.ide.editor.view.messages;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.ui.ide;bundle-version="[3.9.1,4.0.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 37344b2..b845ffd 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java
index 086156d..137d415 100644
--- a/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java
+++ b/bundles/org.eclipse.emf.ecp.ide.editor.view/src/org/eclipse/emf/ecp/ide/editor/view/ViewEditorPart.java
@@ -136,7 +136,7 @@
try {
basicCommandStack = new BasicCommandStack();
- loadView(false);
+ loadView(false, false);
} // BEGIN SUPRESS CATCH EXCEPTION
catch (final Exception e) {// END SUPRESS CATCH EXCEPTION
/*
@@ -149,7 +149,7 @@
try {
registerEcore();
// reload view resource after EClass' package resource was loaded into the package registry
- loadView(true);
+ loadView(true, true);
if (getView() == null) {
throw new IllegalArgumentException(Messages.ViewEditorPart_InvalidVView);
}
@@ -208,7 +208,7 @@
* @throws IOException if the view model resource failed to load
* @throws PartInitException
*/
- private void loadView(boolean migrate) throws IOException, PartInitException {
+ private void loadView(boolean migrate, boolean resolve) throws IOException, PartInitException {
final FileEditorInput fei = (FileEditorInput) getEditorInput();
final ResourceSet resourceSet = createResourceSet();
@@ -226,12 +226,14 @@
if (resource.getContents().size() == 0 || !VView.class.isInstance(resource.getContents().get(0))) {
throw new PartInitException(Messages.ViewEditorPart_InvalidVView);
}
- // resolve all proxies
- int rsSize = resourceSet.getResources().size();
- EcoreUtil.resolveAll(resourceSet);
- while (rsSize != resourceSet.getResources().size()) {
+ if (resolve) {
+ // resolve all proxies
+ int rsSize = resourceSet.getResources().size();
EcoreUtil.resolveAll(resourceSet);
- rsSize = resourceSet.getResources().size();
+ while (rsSize != resourceSet.getResources().size()) {
+ EcoreUtil.resolveAll(resourceSet);
+ rsSize = resourceSet.getResources().size();
+ }
}
}
@@ -580,7 +582,7 @@
// reload view resource after EClass' package resource was loaded into the package registry
try {
- loadView(true);
+ loadView(true, true);
} catch (final IOException e) {
Activator.getDefault().getLog()
.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e));
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 1507259..0912b3b 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.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 122e6dd..b13ea6b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 507e5e5..6b26606 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ide.util;version="1.11.0";
+Export-Package: org.eclipse.emf.ecp.ide.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.ide.util;version="1.12.0";
x-friends:="org.eclipse.emf.ecp.ecore.ui,
org.eclipse.emf.ecp.ide.editor.view,
org.eclipse.emf.ecp.ide.view.service,
@@ -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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.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 e1881b3..4057011 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 acc6f59..812b7ac 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ide.view.service;version="1.11.0";
+Export-Package: org.eclipse.emf.ecp.ide.view.internal.service;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ide.view.service;version="1.12.0";
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.11.0,1.12.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.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 5743f66..17301cb 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a091f28..abc94e9 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.11.0";x-friends:="org.eclipse.emf.ecp.application.e4"
+Export-Package: org.eclipse.emf.ecp.quickfix.ui.e4.internal;version="1.12.0";x-friends:="org.eclipse.emf.ecp.application.e4"
Require-Bundle: org.eclipse.e4.ui.model.workbench;bundle-version="[1.1.0,2.0.0)",
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.quickfix;bundle-version="[1.12.0,1.13.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 388d99e..0069926 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ddd1d2b..d268161 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.quickfix;version="1.11.0",
- org.eclipse.emf.ecp.quickfix.internal;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.quickfix;version="1.12.0",
+ org.eclipse.emf.ecp.quickfix.internal;version="1.12.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 ae54076..d744054 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 efd8e41..aac1964 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.rap.spi.util;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
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 07417fa..d491ddd 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 6680fef..5b77841 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.rap.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.rap;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.rap;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
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 0e6996e..d079a41 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ff3e2ea..a1abba5 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.test.common;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.test.common;version="1.12.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 7096d72..224157a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 53a1def..21fa6a0 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.commands;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e3;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.linkedView;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.perspective;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.platform;version="1.11.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
- org.eclipse.emf.ecp.ui.tester;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.views;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.actions;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.commands;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e3;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.linkedView;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.perspective;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.platform;version="1.12.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.ecp.ui.tester;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.views;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
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 adf187c..d947cd3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.e4/META-INF/MANIFEST.MF
index 5862e53..6cb4d7c 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.handlers;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.e4.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.application.e4",
- org.eclipse.emf.ecp.ui.e4.view;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.internal.e4;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.e4.editor;version="1.12.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.handlers;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.e4.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.application.e4",
+ org.eclipse.emf.ecp.ui.e4.view;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.internal.e4;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
org.eclipse.e4.core.services;bundle-version="[1.0.0,3.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 92c6a6d..79f6ad9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 6b19703..fef90f9 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.12.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.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 da38f01..c84754c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 82aa950..39aafae 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.ui.util;version="1.12.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.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 1231d19..2a34a46 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 60a4b6f..0afd2d9 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.transaction;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.commands;version="0.0.0",
org.eclipse.emf.edit.ui.action;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml b/bundles/org.eclipse.emf.ecp.ui.transaction/pom.xml
index f6d1b7f..3a58734 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2ab0567..cc2d871 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.validation.e4.view;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.validation.e4.handler;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.validation.e4.view;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.12.0,1.13.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 cf6e5d4..1bc3edc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ba21562..15569a1 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4",
- org.eclipse.emf.ecp.ui.validation;version="1.11.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
+Export-Package: org.eclipse.emf.ecp.internal.ui.validation;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4",
+ org.eclipse.emf.ecp.ui.validation;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.validation.e4"
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.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 ee04795..8492d43 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
index c62cb9c..19c971c 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.editor.controls/META-INF/MANIFEST.MF
@@ -2,41 +2,41 @@
Bundle-ManifestVersion: 2
Bundle-Name: Controls
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.editor.controls;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.editor.handler;version="1.11.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.editor.controls;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.editor.handler;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer,org.eclipse.emf.ecp.view.model.editor,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.view.spi.editor.controls;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.workspace.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
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
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 db5c6fe..405d0a5 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
index 50a587d..9322d52 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.linewrapper/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.internal.ui.view.linewrapper;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)"
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 b8fece7..947e5e2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 3e4ed9f..90e1ba8 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: Dependency Injection SWT Renderer
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.view.swt.di;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.di.renderer;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.swt.di.util;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.swt.graphics;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
org.osgi.framework;version="1.8.0"
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml b/bundles/org.eclipse.emf.ecp.ui.view.swt.di/pom.xml
index 41ae9a3..fd957b1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 97010ea..d748b50 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0",
- org.eclipse.emf.ecp.view.internal.swt;version="1.11.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.11.0",
- org.eclipse.emf.ecp.view.spi.swt.layout;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt;version="1.12.0",
+ org.eclipse.emf.ecp.view.internal.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test,org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.spi.swt;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.swt.layout;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
org.eclipse.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 7a0548d..260551f 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/internal/swt/Activator.java b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/internal/swt/Activator.java
index 236a6ab..e76452e 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/internal/swt/Activator.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/internal/swt/Activator.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
@@ -7,7 +7,8 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Edagr Mueller - initial API and implementation
+ * Edgar Mueller - initial API and implementation
+ * Martin Fleck - Bug 490708: Add layout provider service
******************************************************************************/
package org.eclipse.emf.ecp.view.internal.swt;
@@ -21,6 +22,7 @@
import org.eclipse.emfforms.spi.common.report.ReportServiceConsumer;
import org.eclipse.emfforms.spi.core.services.editsupport.EMFFormsEditSupport;
import org.eclipse.emfforms.spi.swt.core.EMFFormsRendererFactory;
+import org.eclipse.emfforms.spi.swt.core.layout.LayoutProvider;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
@@ -106,8 +108,7 @@
*/
public ReportService getReportService() {
final BundleContext bundleContext = getBundle().getBundleContext();
- final ServiceReference<ReportService> serviceReference =
- bundleContext.getServiceReference(ReportService.class);
+ final ServiceReference<ReportService> serviceReference = bundleContext.getServiceReference(ReportService.class);
return bundleContext.getService(serviceReference);
}
@@ -141,4 +142,22 @@
return service;
}
+ /**
+ * Returns the {@link LayoutProvider} service.
+ *
+ * @return The {@link LayoutProvider}
+ */
+ public LayoutProvider getLayoutProvider() {
+ final ServiceReference<LayoutProvider> serviceReference = plugin.getBundle().getBundleContext()
+ .getServiceReference(LayoutProvider.class);
+ if (serviceReference == null) {
+ return null;
+ }
+ final LayoutProvider service = plugin.getBundle().getBundleContext()
+ .getService(serviceReference);
+ plugin.getBundle().getBundleContext().ungetService(serviceReference);
+
+ return service;
+ }
+
}
diff --git a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/LayoutProviderHelper.java b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/LayoutProviderHelper.java
index 1b5ec6b..833e7c0 100644
--- a/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/LayoutProviderHelper.java
+++ b/bundles/org.eclipse.emf.ecp.ui.view.swt/src/org/eclipse/emf/ecp/view/spi/swt/layout/LayoutProviderHelper.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
@@ -8,6 +8,7 @@
*
* Contributors:
* Eugen - initial API and implementation
+ * Martin Fleck - Bug 490708: Add layout provider service
******************************************************************************/
package org.eclipse.emf.ecp.view.spi.swt.layout;
@@ -50,7 +51,14 @@
private static synchronized List<LayoutProvider> getLayoutProvider() {
if (layoutProviders == null || layoutProviders.isEmpty()) {
- readLayoutProviders();
+ final LayoutProvider layoutProviderService = Activator.getDefault().getLayoutProvider();
+ // allow service registration and registration through extension points
+ // service has precedence over extension points
+ if (layoutProviderService != null) {
+ layoutProviders.add(layoutProviderService);
+ } else {
+ readLayoutProviders();
+ }
}
return layoutProviders;
}
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 72c9792..7449658 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0",
- org.eclipse.emf.ecp.view.internal.provider;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
- org.eclipse.emf.ecp.view.internal.ui;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
- org.eclipse.emf.ecp.view.spi.provider;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.renderer;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.ui.view;version="1.12.0",
+ org.eclipse.emf.ecp.view.internal.provider;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.internal.ui;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt",
+ org.eclipse.emf.ecp.view.spi.provider;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.provider.reporting;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.renderer;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/EMFFormsViewService.xml
Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 adfc376..2c163dd 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
index e1966dd..c2c8e6c 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";
+Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.internal.ui.dialogs;version="1.11.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.internal.ui.model;version="1.11.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.11.0",
- org.eclipse.emf.ecp.internal.ui.util;version="1.11.0";
+ org.eclipse.emf.ecp.internal.ui.composites;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.internal.ui.dialogs;version="1.12.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.internal.ui.model;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.e4,org.eclipse.emf.ecp.ui.e3,org.eclipse.emf.ecp.ui.transaction",
+ org.eclipse.emf.ecp.internal.ui.tester;version="1.12.0",
+ org.eclipse.emf.ecp.internal.ui.util;version="1.12.0";
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.11.0";
+ org.eclipse.emf.ecp.internal.wizards;version="1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
- org.eclipse.emf.ecp.spi.ui;version="1.11.0",
- org.eclipse.emf.ecp.spi.ui.util;version="1.11.0",
- org.eclipse.emf.ecp.ui;version="1.11.0",
- org.eclipse.emf.ecp.ui.common;version="1.11.0";
+ org.eclipse.emf.ecp.internal.wizards.page;version="1.12.0";x-friends:="org.eclipse.emf.ecp.explorereditorbridge",
+ org.eclipse.emf.ecp.spi.ui;version="1.12.0",
+ org.eclipse.emf.ecp.spi.ui.util;version="1.12.0",
+ org.eclipse.emf.ecp.ui;version="1.12.0",
+ org.eclipse.emf.ecp.ui.common;version="1.12.0";
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.11.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
- org.eclipse.emf.ecp.ui.util;version="1.11.0"
+ org.eclipse.emf.ecp.ui.common.dnd;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls",
+ org.eclipse.emf.ecp.ui.util;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
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 cd968aa..15e694c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/spi/ui/util/ECPHandlerHelper.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/spi/ui/util/ECPHandlerHelper.java
index fe9857f..8e74e0d 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/spi/ui/util/ECPHandlerHelper.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/spi/ui/util/ECPHandlerHelper.java
@@ -16,7 +16,9 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.eclipse.core.runtime.CoreException;
@@ -57,6 +59,7 @@
import org.eclipse.emf.ecp.ui.common.ECPCompositeFactory;
import org.eclipse.emf.ecp.ui.util.ECPModelElementOpenTester;
import org.eclipse.emf.ecp.ui.util.ECPModelElementOpener;
+import org.eclipse.emf.ecp.ui.util.ECPModelElementOpenerWithContext;
import org.eclipse.emf.edit.command.ChangeCommand;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -334,7 +337,8 @@
addRepositoryComposite.getProvider(), addRepositoryComposite.getRepositoryName(),
addRepositoryComposite.getRepositoryLabel() == null ? "" : addRepositoryComposite.getRepositoryLabel(), //$NON-NLS-1$
addRepositoryComposite.getRepositoryDescription() == null ? "" : addRepositoryComposite //$NON-NLS-1$
- .getRepositoryDescription(), addRepositoryComposite.getProperties());
+ .getRepositoryDescription(),
+ addRepositoryComposite.getProperties());
return ecpRepository;
}
return null;
@@ -384,18 +388,18 @@
}
/**
- * This opens the model element.
+ * Resolve the a {@link ECPModelElementOpener} for the given model element.
*
- * @param me
- * ModelElement to open
- * the view that requested the open model element
- * @param ecpProject the {@link ECPProject} of the model element
+ * @param modelElement the element to find a opener for
+ * @return a {@link ECPModelElementOpener} or null if no opener has been found
+ *
+ * @since 1.12
*/
- public static void openModelElement(final Object me, ECPProject ecpProject) {
- if (me == null) {
+ public static ECPModelElementOpener resolveElementOpener(final Object modelElement) {
+ if (modelElement == null) {
MessageDialog.openError(Display.getCurrent().getActiveShell(),
Messages.ActionHelper_ErrorTitle_ElementDeleted, Messages.ActionHelper_ErrorMessage_ElementDeleted);
- return;
+ return null;
}
IConfigurationElement[] modelelementopener = Platform.getExtensionRegistry().getConfigurationElementsFor(
"org.eclipse.emf.ecp.ui.modelElementOpener"); //$NON-NLS-1$
@@ -414,7 +418,7 @@
final Class<?> supportedClassType = HandlerHelperUtil.loadClass(testerElement
.getContributor().getName(),
type);
- if (supportedClassType.isInstance(me)) {
+ if (supportedClassType.isInstance(modelElement)) {
if (priority > bestValue) {
bestCandidate = modelelementOpener;
bestValue = priority;
@@ -427,7 +431,7 @@
} else if ("dynamicTester".equals(testerElement.getName())) {//$NON-NLS-1$
final ECPModelElementOpenTester tester = (ECPModelElementOpenTester) testerElement
.createExecutableExtension("tester"); //$NON-NLS-1$
- final int value = tester.isApplicable(me);
+ final int value = tester.isApplicable(modelElement);
if (value > bestValue) {
bestCandidate = modelelementOpener;
bestValue = value;
@@ -440,14 +444,48 @@
Activator.log(e);
}
}
+ return bestCandidate;
+ }
+
+ /**
+ * Open a view for the given model element.
+ *
+ * @param modelElement
+ * ModelElement to open
+ * the view that requested the open model element
+ * @param ecpProject the {@link ECPProject} of the model element
+ */
+ public static void openModelElement(final Object modelElement, ECPProject ecpProject) {
+ openModelElement(modelElement, ecpProject, new LinkedHashMap<Object, Object>());
+ }
+
+ /**
+ * Open a view for the given model element.
+ *
+ * @param modelElement
+ * ModelElement to open
+ * the view that requested the open model element
+ * @param ecpProject the {@link ECPProject} of the model element
+ * @param contextMap context map
+ * @since 1.12
+ */
+ public static void openModelElement(final Object modelElement, ECPProject ecpProject,
+ Map<Object, Object> contextMap) {
+
+ final ECPModelElementOpener opener = resolveElementOpener(modelElement);
+
// TODO: find solution
// ECPWorkspaceManager.getObserverBus().notify(ModelElementOpenObserver.class).onOpen(me, sourceView, name);
// BEGIN SUPRESS CATCH EXCEPTION
- if (bestCandidate == null) {
+ if (opener == null) {
return;
}
try {
- bestCandidate.openModelElement(me, ecpProject);
+ if (opener instanceof ECPModelElementOpenerWithContext) {
+ ((ECPModelElementOpenerWithContext) opener).openModelElement(modelElement, ecpProject, contextMap);
+ } else {
+ opener.openModelElement(modelElement, ecpProject);
+ }
} catch (final RuntimeException e) {
Activator.log(e);
}
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/util/ECPModelElementOpenerWithContext.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/util/ECPModelElementOpenerWithContext.java
new file mode 100644
index 0000000..d525d51
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/ui/util/ECPModelElementOpenerWithContext.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Mat Hansen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.ui.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecp.core.ECPProject;
+
+/**
+ * This interface is used to open a specific editor for a model element.
+ * ECP provides a common implementation able to handle all EObjects.
+ * Additionally this interface allows to pass a context map with arbitrary objects to the opener.
+ *
+ * @author Mat Hansen <mhansen@eclipsesource.com>
+ * @since 1.12
+ *
+ */
+public interface ECPModelElementOpenerWithContext extends ECPModelElementOpener {
+
+ /**
+ * The action to open the model element.
+ *
+ * @param element
+ * the element to open
+ * @param ecpProject
+ * the project this element belongs to
+ * @param context the additional context objects
+ */
+ void openModelElement(Object element, ECPProject ecpProject, Map<Object, Object> context);
+
+}
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 674efd2..5628b6a 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.connector;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)"
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 2e75f45..580b443 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8a2d6b9..14d85c7 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.api;version="1.11.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
+Export-Package: org.eclipse.emf.ecp.internal.validation;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.api;version="1.12.0";x-friends:="org.eclipse.emf.ecp.validation.connector"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
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 98559a5..4275619 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7a20736..6eaae1d 100644
--- a/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validationvieweditorbridge/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation View to Editor Bridge
Bundle-SymbolicName: org.eclipse.emf.ecp.validationvieweditorbridge;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.validation;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.internal.validationvieweditorbridge;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.validation;bundle-version="[1.12.0,1.13.0)"
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 70f6630..d5eb4c4 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 3388677..527d681 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 a177118..288514e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7f58d3e..0c2a584 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.categorization.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.categorization.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
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 5d255eb..50c9977 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 888462d..5dcdfeb 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.categorization.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)"
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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.eclipse.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 db6cf9c..bc0d8db 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
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 65856da..5843dc2 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 d7ae907..0d591be 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 cd5e5de..89b2cf8 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 3948f8c..168b405 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2eac995..e337554 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.compoundcontrol.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 c02b1d0..1a175e9 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.classpath b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.classpath
index ad32c83..e27aa38 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.classpath
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.classpath
@@ -2,6 +2,4 @@
<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.compoundcontrol.tooling/.project b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.project
index dec7256..98795af 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.project
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.project
@@ -6,11 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -28,7 +23,6 @@
</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.compoundcontrol.tooling/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c948297..0000000
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,418 +0,0 @@
-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.compoundcontrol.tooling/.settings/org.eclipse.jdt.launching.prefs b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 3bb2352..0000000
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8bc4bb4..0000000
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,127 +0,0 @@
-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.compoundcontrol.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/META-INF/MANIFEST.MF
index c58e166..4fe072e 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/build.properties b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/build.properties
index 8fbeb36..21d033f 100644
--- a/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/build.properties
+++ b/bundles/org.eclipse.emf.ecp.view.compoundcontrol.tooling/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
bin.includes = META-INF/,\
viewmodel/,\
.,\
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 fccf54e..4f5a0c9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e317277..7fb174a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.internal.locale;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
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 4d4c5fe..185311c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 31a6898..0723f61 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.context;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.context;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.context;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.common;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 2874a18..44d9104 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 78d194a..0d8041f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.control.multireference;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
org.eclipse.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 3b84651..1641567 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 fe1f5fc..a1ed7f7 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.11.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.11.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.core.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls,org.eclipse.emf.ecp.view.context.test",
+ org.eclipse.emf.ecp.view.spi.core.swt;version="1.12.0";
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.11.0"
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.200,2.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.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 4402561..5dfe970 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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/NumberControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlSWTRenderer.java
index 06496f4..9849ae7 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlSWTRenderer.java
@@ -132,15 +132,15 @@
final EStructuralFeature structuralFeature = (EStructuralFeature) getModelValue().getValueType();
final NumericalTargetToModelUpdateStrategy targetToModelStrategy = new NumericalTargetToModelUpdateStrategy(
- structuralFeature, getViewModelContext(), getModelValue(), getDataBindingContext(),
+ structuralFeature, getModelValue(), getDataBindingContext(),
(Text) Composite.class.cast(control).getChildren()[0]);
final NumericalModelToTargetUpdateStrategy modelToTargetStrategy = new NumericalModelToTargetUpdateStrategy(
- getInstanceClass(structuralFeature), getViewModelContext(), false);
+ getInstanceClass(structuralFeature), false);
final Binding binding = bindValue(control, getModelValue(), getDataBindingContext(),
targetToModelStrategy, modelToTargetStrategy);
final Binding tooltipBinding = createTooltipBinding(control, getModelValue(), getDataBindingContext(),
targetToModelStrategy,
- new NumericalModelToTargetUpdateStrategy(getInstanceClass(structuralFeature), getViewModelContext(), true));
+ new NumericalModelToTargetUpdateStrategy(getInstanceClass(structuralFeature), true));
emfFormsLocaleChangeListener = new EMFFormsLocaleChangeListener() {
@@ -171,13 +171,11 @@
private class NumericalModelToTargetUpdateStrategy extends ModelToTargetUpdateStrategy {
private final Class<?> instanceClass;
- private final ViewModelContext viewModelContext;
- NumericalModelToTargetUpdateStrategy(Class<?> instanceClass, ViewModelContext viewModelContext,
+ NumericalModelToTargetUpdateStrategy(Class<?> instanceClass,
boolean tooltip) {
super(tooltip);
this.instanceClass = instanceClass;
- this.viewModelContext = viewModelContext;
}
@@ -200,18 +198,16 @@
*/
private class NumericalTargetToModelUpdateStrategy extends TargetToModelUpdateStrategy {
- private final ViewModelContext viewModelContext;
private final Text text;
private final IObservableValue modelValue;
private final EStructuralFeature eStructuralFeature;
private final DataBindingContext dataBindingContext;
- NumericalTargetToModelUpdateStrategy(EStructuralFeature eStructuralFeature,
- ViewModelContext viewModelContext, IObservableValue modelValue, DataBindingContext dataBindingContext,
+ NumericalTargetToModelUpdateStrategy(EStructuralFeature eStructuralFeature, IObservableValue modelValue,
+ DataBindingContext dataBindingContext,
Text text) {
super(eStructuralFeature.isUnsettable());
this.eStructuralFeature = eStructuralFeature;
- this.viewModelContext = viewModelContext;
this.modelValue = modelValue;
this.dataBindingContext = dataBindingContext;
this.text = text;
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 914cc29..fc78db2 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
@@ -139,6 +139,9 @@
@Override
public void notifyChange(ModelChangeNotification notification) {
+ if (isDisposed) {
+ return;
+ }
// Execute applyEnable whenever the structure of the VControl's DMR has been changed.
final EMFFormsStructuralChangeTester changeTester = getViewModelContext()
.getService(EMFFormsStructuralChangeTester.class);
diff --git a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/ContainerSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/ContainerSWTRenderer.java
index 20d412b..cbad33d 100644
--- a/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/ContainerSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.core.swt/src/org/eclipse/emf/ecp/view/spi/core/swt/ContainerSWTRenderer.java
@@ -151,8 +151,7 @@
}
rowGridDescription.put(child, gridDescription);
if (maximalGridDescription == null
- || maximalGridDescription.getColumns() < gridDescription.getColumns())
- {
+ || maximalGridDescription.getColumns() < gridDescription.getColumns()) {
maximalGridDescription = gridDescription;
}
final Set<AbstractSWTRenderer<VElement>> allRenderer = new LinkedHashSet<AbstractSWTRenderer<VElement>>();
@@ -208,11 +207,12 @@
}
/**
- * Package visible method, to allow an easy replacement.
+ * Returns the {@link EMFFormsDatabinding}.
*
- * @return The EMFFormsDatabinding
+ * @return The {@link EMFFormsDatabinding}
+ * @since 1.12
*/
- private EMFFormsDatabinding getEMFFormsDatabinding() {
+ protected EMFFormsDatabinding getEMFFormsDatabinding() {
// Method is eventually needed to check the validity of controls that are to be rendered.
return emfFormsDatabinding;
}
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 b46092a..302b6ba 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
@@ -428,6 +428,7 @@
sl.topControl = createUnsetLabel;
unsetButton.setImage(Activator.getImage(ICONS_SET_FEATURE));
}
+ controlComposite.layout(true);
/* There is no UNSET databinding trigger available */
final UnsetModelChangeListener unsetModelChangeListener = new UnsetModelChangeListener(eObject, unsetButton,
structuralFeature, createUnsetLabel, controlComposite, sl, baseControl);
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 bcad21d..0703f80 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
@@ -285,6 +285,8 @@
controlToUnset = Composite.class
.cast(Composite.class.cast(Composite.class.cast(control).getChildren()[0]).getChildren()[0])
.getChildren()[0];
+ } else {
+ controlToUnset = Composite.class.cast(control).getChildren()[0];
}
Text.class.cast(controlToUnset).setEditable(enabled);
} else {
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.model.edit/META-INF/MANIFEST.MF
index 0ecc95e..21a482e 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
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 7e0cc0c..11f8c42 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
index c184c84..93e4c1f 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.model/META-INF/MANIFEST.MF
@@ -2,31 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.custom.model;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0",
- org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.custom.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.custom.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/EMFFormsCustomDMRExpander.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRConverter.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.CustomDMRMappingProvider.xml,OSGI-INF/org.eclipse.emf.ecp.view.spi.custom.model.impl.StructuralChangeCustomDMRTester.xml
Import-Package: org.eclipse.core.databinding.property.list;version="0.0.0",
org.eclipse.core.databinding.property.value;version="0.0.0",
org.eclipse.emf.databinding;version="0.0.0",
- org.eclipse.emf.ecp.common.spi;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.spi.asserts;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.common.spi;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.spi.asserts;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.12.0,1.13.0)",
org.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 814572d..68563a4 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
index 0723f88..00dbf90 100644
--- a/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.custom.ui.swt.di/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.di.renderer;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common.di;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt.di;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 ccdc2e1..709b7c9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 37908c4..221a84d 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
- org.eclipse.emf.ecp.view.spi.custom.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.custom.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.custom.ui.swt.test",
+ org.eclipse.emf.ecp.view.spi.custom.swt;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
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 7a5f287..64d46f2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d0ac8a3..12bfd83 100644
--- a/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.edapt/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Edapt
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edapt.history;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 30b2347..2417ba1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 5fcd4b4..ffaf844 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 99e7e2c..7b573b3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 f0631e2..7b52cc8 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.group.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.group.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.group.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.group.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
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 7aca333..338800c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 13a6236..3d4cfb9 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsable;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.eclipse.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 8e9dc41..b6f42d7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 5fd7c22..9d41df5 100644
--- a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.swt.internal.collapsible.pgroup;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.nebula.widgets.pgroup;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml b/bundles/org.eclipse.emf.ecp.view.group.swt.collapsible.pgroup/pom.xml
index 1a5d504..9ff3d04 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2a5d224..ff44078 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.alignmentgroup.internal.swt;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 dfcf529..44f6439 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 fb24f09..9730c7a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.11.0",
- org.eclipse.emfforms.internal.group.swt;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.group.swt;version="1.12.0",
+ org.eclipse.emfforms.internal.group.swt;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.eclipse.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 a6216ca..3f337e2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 04e7d7e..f021e97 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
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 e2a5bfb..56b639b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 9c8ece6..2c2fc1d 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.groupedgrid.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 d4aa74f..7a3971f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 f81fdda..1797769 100644
--- a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.groupedgrid.swt;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.groupedgrid.ui.swt/pom.xml
index 1bdff7a..25ba7e4 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 efde8d4..d81b03d 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 63f114f..77bac32 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8ae2e41..f231d3b 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.horizontal.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.horizontal.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 f33961f..6f42a28 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 786865f..600d446 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.horizontal.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.horizontal.swt;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.internal.core.swt;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.internal.core.swt;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.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 025423b..36119b1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0b9be18..77cf4c3 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 5921fd1..eabcc6d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e24395d..d6611df 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.indexdmr.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.indexdmr.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 fd138d5..b1f48d3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 12af746..9338290 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.indexdmr.tooling;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 e46324a..daa6d99 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 66c594a..d91c55d 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 a468897..17797db 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8468053..6756a3f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.keyattributedmr.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.keyattributedmr.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 33f6f30..628694d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 57d3958..88f4c37 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.keyattributedmr.tooling;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 9b26f91..534d5e8 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 02893fc..64c8e79 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 a35b831..56bbb85 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 faacecd..b718759 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.label.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.label.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.label.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.label.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 719d7ca..703be36 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7def22a..e355b4b 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.label.rap;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.label.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
org.eclipse.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 27495f3..c3dc8b3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e315861..ab87607 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.label.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.label.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.label.swt;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.eclipse.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 f716790..b02ed87 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 94cc402..eef3bba 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 3019e96..c27688a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0f73f16..9163a5a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.spi.mappingdmr.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.mappingdmr.model.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.mappingdmr.model.edit"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.mappingdmr.model/pom.xml
index 7bff306..0294d8b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8e22ad6..03a108f 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.mappingdmr.tooling;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 2ba272f..b4142a3 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java
index eba768a..82ba288 100644
--- a/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.mappingdmr.tooling/src/org/eclipse/emf/ecp/view/mappingdmr/tooling/MappedEClassControlSWTRenderer.java
@@ -59,7 +59,8 @@
* @param viewContext the view context
* @param reportService the {@link ReportService}
*/
- public MappedEClassControlSWTRenderer(VControl vElement, ViewModelContext viewContext, ReportService reportService) {
+ public MappedEClassControlSWTRenderer(VControl vElement, ViewModelContext viewContext,
+ ReportService reportService) {
super(vElement, viewContext, reportService);
}
@@ -192,6 +193,9 @@
final EClass referenceMap = EReference.class.cast(dmr.getDomainModelEFeature()).getEReferenceType();
final EReference valueReference = EReference.class.cast(referenceMap.getEStructuralFeature("value")); //$NON-NLS-1$
+ if (valueReference == null) {
+ return null;
+ }
return EMFUtils.getSubClasses(valueReference.getEReferenceType());
// return Registry.INSTANCE;
}
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 ec7ebbf..0a944e5 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.11.0",
- org.eclipse.emf.ecp.spi.view.migrator.string;version="1.11.0",
- org.eclipse.emf.ecp.view.migrator;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.spi.view.migrator;version="1.12.0",
+ org.eclipse.emf.ecp.spi.view.migrator.string;version="1.12.0",
+ org.eclipse.emf.ecp.view.migrator;version="1.12.0"
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.11.0,1.12.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.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 aaf3cb5..9a260c0 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c216492..50a9223 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.common.di/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.common.di.messages;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common.di.util;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.model.common.di.messages;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.renderer;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.service.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common.di.util;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.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 f7dcce0..e07da34 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 30b1c65..22d44ac 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.common/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: Common View Model Classes
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.common
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.common;version="1.11.0",
- org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.common.callback;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.model.common;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.common;version="1.12.0",
+ org.eclipse.emf.ecp.view.model.common.edit.provider;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.common.callback;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.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 f494ae8..d2b5516 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 cf569b0..c8a6736 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.model.edapt/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Edapt Migration for Core View Model
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.edapt;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.internal.view.model.edapt._160to170;version="1.12.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 935fa99..479c5e4 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 98b77f1..b25681f 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.model.provider;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 ac09b72..9f640a0 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 39c0897..b712bc0 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.project.handlers;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.project.installer;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/plugin.xml b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/plugin.xml
index 9fd1826..3e1bf33 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor.project.installer/plugin.xml
@@ -33,7 +33,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer">
+ locationURI="popup:org.eclipse.ui.popup.any">
<menu
id="org.eclipse.emf.ecp.ui.e3.emfFormsMenu"
label="EMF Forms">
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 1208cb6..cfd603e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 3f457a5..42817bf 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.presentation;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer"
+Export-Package: org.eclipse.emf.ecp.view.model.actions;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.presentation;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.model.project.installer"
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
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/plugin.xml b/bundles/org.eclipse.emf.ecp.view.model.editor/plugin.xml
index a7f6fac..466f96b 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.editor/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.editor/plugin.xml
@@ -34,7 +34,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="true"
- locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">
+ locationURI="popup:org.eclipse.ui.popup.any">
<menu
id="org.eclipse.emf.ecp.ui.e3.emfFormsMenu"
label="EMF Forms">
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 6fd2b80..ea4f6fc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 60d33ac..718f808 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.generator;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)"
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 a007edd..a0d53f9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 bd3ebad..71968a9 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,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Preview Common
Bundle-SymbolicName: org.eclipse.emf.ecp.view.model.preview.common;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.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.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider.xml
+Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.resources;version="0.0.0",
- org.eclipse.emf.ecp.ui.view.swt;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.locale;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
org.eclipse.jface;version="0.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",
org.osgi.service.component.annotations;version="1.2.0"
-Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.model.preview.common.PreviewWorkspaceViewProvider.xml
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 322c076..7f17b5c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 bffb23a..ce87881 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.model.internal.preview;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.actions;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.internal.preview.e3.views;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.11.0,1.12.0)";resolution:=optional,
- org.eclipse.emfforms.editor;bundle-version="[1.11.0,1.12.0)";resolution:=optional
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.editor.viewmodel;bundle-version="[1.12.0,1.13.0)";resolution:=optional,
+ org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)";resolution:=optional
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/plugin.xml b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/plugin.xml
index 3c14b88..7a8d920 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.preview.e3/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.view.model.preview.e3/plugin.xml
@@ -48,7 +48,7 @@
</menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.jdt.ui.PackageExplorer">
+ locationURI="popup:org.eclipse.ui.popup.any">
<separator
name="org.eclipse.emf.ecp.ui.e3.viewModelSeparator">
</separator>
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 c5a1b44..3ee082c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e7d8e8d..b0f993d 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi;version="1.11.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
+Export-Package: org.eclipse.emf.ecp.internal.view.model.provider.xmi;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ui.view.editor.controls"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.migrator;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 6050554..ec1ffd3 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/src/org/eclipse/emf/ecp/view/model/provider/xmi/ViewModelFileExtensionsManager.java b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/src/org/eclipse/emf/ecp/view/model/provider/xmi/ViewModelFileExtensionsManager.java
index c1d9033..7c03caf 100644
--- a/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/src/org/eclipse/emf/ecp/view/model/provider/xmi/ViewModelFileExtensionsManager.java
+++ b/bundles/org.eclipse.emf.ecp.view.model.provider.xmi/src/org/eclipse/emf/ecp/view/model/provider/xmi/ViewModelFileExtensionsManager.java
@@ -18,7 +18,6 @@
import java.io.OutputStream;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -32,6 +31,7 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.common.util.WrappedException;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -40,6 +40,7 @@
import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.emf.ecp.internal.view.model.provider.xmi.Activator;
import org.eclipse.emf.ecp.view.migrator.ViewModelMigrationException;
import org.eclipse.emf.ecp.view.migrator.ViewModelMigrator;
@@ -71,6 +72,14 @@
private static final String FILE_EXTENSION = "org.eclipse.emf.ecp.view.model.provider.xmi.file"; //$NON-NLS-1$
private static final String FILEPATH_ATTRIBUTE = "filePath"; //$NON-NLS-1$
+ private static final Map<Object, Object> LOAD_OPTIONS = new LinkedHashMap<Object, Object>();
+ {
+ LOAD_OPTIONS.put(URIConverter.OPTION_TIMEOUT, 1);
+ LOAD_OPTIONS.put(XMLResource.OPTION_DEFER_ATTACHMENT, Boolean.TRUE);
+ LOAD_OPTIONS.put(XMLResource.OPTION_DEFER_IDREF_RESOLUTION, Boolean.TRUE);
+ LOAD_OPTIONS.put(XMLResource.OPTION_USE_DEPRECATED_METHODS, Boolean.TRUE);
+ }
+
private final Map<EClass, Map<VView, Set<ExtensionDescription>>> map = new LinkedHashMap<EClass, Map<VView, Set<ExtensionDescription>>>();
private static File viewModelFolder;
@@ -185,24 +194,22 @@
}
final ResourceSet resourceSet = new ResourceSetImpl();
+ resourceSet.getLoadOptions().putAll(LOAD_OPTIONS);
final Map<String, Object> extensionToFactoryMap = resourceSet
.getResourceFactoryRegistry().getExtensionToFactoryMap();
extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
new VViewResourceFactoryImpl());
- resourceSet.getPackageRegistry().put(VViewPackage.eNS_URI,
- VViewPackage.eINSTANCE);
- final VViewResourceImpl resource = (VViewResourceImpl) resourceSet.createResource(uri);
-
- final Map<Object, Object> loadOptions = new HashMap<Object, Object>();
-
+ resourceSet.getPackageRegistry().put(VViewPackage.eNS_URI, VViewPackage.eINSTANCE);
+ VViewResourceImpl resource;
try {
- resource.load(loadOptions);
- } catch (final IOException exception) {
+ resource = (VViewResourceImpl) resourceSet.getResource(uri, true);
+ } catch (final WrappedException exception) {
final ReportService reportService = Activator.getReportService();
if (reportService != null) {
reportService.report(new AbstractReport(exception,
"Loading view model failed. Maybe a migration is needed. Please take a look at the migration guide at: http://www.eclipse.org/ecp/emfforms/documentation.html")); //$NON-NLS-1$
}
+ resource = (VViewResourceImpl) resourceSet.createResource(uri);
}
return resource;
}
@@ -216,7 +223,7 @@
return uri;
}
final URIConverter uriConverter = new ExtensibleURIConverterImpl();
- final InputStream inputStream = uriConverter.createInputStream(uri);
+ final InputStream inputStream = uriConverter.createInputStream(uri, LOAD_OPTIONS);
copy(inputStream, dest);
uri = URI.createFileURI(dest.getAbsolutePath());
@@ -317,9 +324,9 @@
final String bundleName = file.getContributor().getName();
final String path = bundleName + '/' + filePath;
uri = URI.createPlatformPluginURI(path, false);
- if (!converter.exists(uri, null)) {
+ if (!converter.exists(uri, LOAD_OPTIONS)) {
uri = URI.createPlatformResourceURI(filePath, false);
- if (!converter.exists(uri, null)) {
+ if (!converter.exists(uri, LOAD_OPTIONS)) {
final ReportService reportService = Activator.getReportService();
if (reportService != null) {
reportService.report(new AbstractReport(
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 29d34e6..0f55538 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.model.reporting;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.model.internal.reporting;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.model.reporting;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.model.util;version="1.12.0"
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.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.model/pom.xml
index ac67a54..8624240 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.11.0-SNAPSHOT</version>
+ <version>1.12.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/VElement.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VElement.java
index e2c1c79..b469b649 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VElement.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/VElement.java
@@ -264,4 +264,28 @@
* @generated
*/
void setUuid(String value);
+
+ /**
+ * Returns true if this element and all parent elements are visible.
+ *
+ * @since 1.12
+ * @return true if this element and all parent elements are visible
+ */
+ boolean isEffectivelyVisible();
+
+ /**
+ * Returns true if this element and all parent elements are enabled.
+ *
+ * @since 1.12
+ * @return true if this element and all parent elements are enabled
+ */
+ boolean isEffectivelyEnabled();
+
+ /**
+ * Returns true if this element or any parent element is readonly.
+ *
+ * @since 1.12
+ * @return true if this element or any parent element is readonly
+ */
+ boolean isEffectivelyReadonly();
} // Renderable
diff --git a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java
index 3dbebca..d939d8c 100644
--- a/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.model/src/org/eclipse/emf/ecp/view/spi/model/impl/VElementImpl.java
@@ -17,6 +17,7 @@
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.EObject;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
@@ -649,4 +650,66 @@
return result.toString();
}
+ private VElement getVElementParent() {
+ EObject parent = eContainer();
+ while (parent != null) {
+ if (VElement.class.isInstance(parent)) {
+ return VElement.class.cast(parent);
+ }
+ parent = parent.eContainer();
+ }
+ return null;
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.model.VElement#isEffectivelyVisible()
+ * @since 1.12
+ */
+ @Override
+ public boolean isEffectivelyVisible() {
+ boolean result = isVisible();
+ final VElement parent = getVElementParent();
+ if (parent != null) {
+ result &= parent.isEffectivelyVisible();
+ }
+ return result;
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.model.VElement#isEffectivelyEnabled()
+ * @since 1.12
+ */
+ @Override
+ public boolean isEffectivelyEnabled() {
+ boolean result = isEnabled();
+ final VElement parent = getVElementParent();
+ if (parent != null) {
+ result &= parent.isEffectivelyEnabled();
+ }
+ return result;
+ }
+
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.ecp.view.spi.model.VElement#isEffectivelyReadonly()
+ * @since 1.12
+ */
+ @Override
+ public boolean isEffectivelyReadonly() {
+ boolean result = isReadonly();
+ final VElement parent = getVElementParent();
+ if (parent != null) {
+ result &= parent.isEffectivelyReadonly();
+ }
+ return result;
+ }
+
} // RenderableImpl
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 efc3e83..6178f78 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 cec681a..0c14315 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.rule.model/.settings/.api_filters
index 10d40c3..77a3e30 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.rule.model/.settings/.api_filters
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.ecp.view.rule.model" version="2">
<resource path="META-INF/MANIFEST.MF">
+ <filter comment="SPI change" id="923795461">
+ <message_arguments>
+ <message_argument value="1.11.0"/>
+ <message_argument value="1.10.0"/>
+ </message_arguments>
+ </filter>
<filter comment="This is SPI" id="923795461">
<message_arguments>
<message_argument value="1.5.0"/>
@@ -78,6 +84,13 @@
<message_argument value="2"/>
</message_arguments>
</filter>
+ <filter comment="SPI change" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.rule.model.RulePackage"/>
+ <message_argument value="LEAF_CONDITION_FEATURE_COUNT"/>
+ <message_argument value="3"/>
+ </message_arguments>
+ </filter>
<filter comment="SPI model regenerated" id="403767336">
<message_arguments>
<message_argument value="org.eclipse.emf.ecp.view.spi.rule.model.RulePackage"/>
@@ -86,6 +99,18 @@
</filter>
</resource>
<resource path="src/org/eclipse/emf/ecp/view/spi/rule/model/RulePackage.java" type="org.eclipse.emf.ecp.view.spi.rule.model.RulePackage$Literals">
+ <filter comment="SPI change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.rule.model.RulePackage.Literals"/>
+ <message_argument value="COMPARE_TYPE"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI change" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.spi.rule.model.RulePackage.Literals"/>
+ <message_argument value="LEAF_CONDITION__COMPARE_TYPE"/>
+ </message_arguments>
+ </filter>
<filter comment="SPI model regenerated" id="403767336">
<message_arguments>
<message_argument value="org.eclipse.emf.ecp.view.spi.rule.model.RulePackage.Literals"/>
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 422f47f..343aa27 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0",
- org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.rule.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.rule.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule.model/pom.xml
index d856e65..1a800c8 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
index a256b3d..fbdf7b8 100644
--- a/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.rule/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: View Model Rule
Bundle-SymbolicName: org.eclipse.emf.ecp.view.rule;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.11.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.rule;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.rule.test,org.eclipse.emf.ecp.view.model.integrationtest,org.eclipse.emf.ecp.view.unset.test",
+ org.eclipse.emf.ecp.view.spi.rule;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
org.osgi.service.component.annotations;version="1.2.0"
Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.OrConditionService.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.LeafConditionService.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.AndConditionService.xml,OSGI-INF/org.eclipse.emf.ecp.view.internal.rule.ConditionServiceManagerImpl.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.rule/pom.xml b/bundles/org.eclipse.emf.ecp.view.rule/pom.xml
index fd38195..49eb28e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<groupId>org.eclipse.emf.ecp</groupId>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.section.model.edit/META-INF/MANIFEST.MF
index 7ef2fc0..5543641 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 5d37ebe..d27b4aa 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 41ccaef..81bf486 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.section.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.section.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.section.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.section.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 a278b84..4e366bc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 aad6af3..b6a85e3 100644
--- a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/META-INF/MANIFEST.MF
@@ -2,24 +2,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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.section.swt;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.section.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.section.ui.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.section.swt;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.section.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/SectionLeafSWTRendererService.xml,OSGI-INF/SectionNodeSWTRendererService.xml,OSGI-INF/SectionedAreaSWTRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.section.ui.swt/pom.xml
index 91f5d30..f7b75f1 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.stack.model.edit/META-INF/MANIFEST.MF
index 4c954d5..2b8485b 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 8eaa913..4020547 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1e28163..9bee577 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.model/pom.xml
index a2113e8..bc5fd47 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 326e501..03dda49 100644
--- a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.stack.ui.swt;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.stack.ui.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.stack.ui.swt;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.custom;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.stack.ui.swt/pom.xml
index 69bc2eb..be275cf 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2c55b3f..15b1130 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.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 aada9d5..5d80e74 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/.project b/bundles/org.eclipse.emf.ecp.view.swt.layout/.project
index 9c38e64..c30b230 100644
--- a/bundles/org.eclipse.emf.ecp.view.swt.layout/.project
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/.project
@@ -30,6 +30,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
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 b7a173d..945f4cf 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,14 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default LayoutProvider
Bundle-SymbolicName: org.eclipse.emf.ecp.view.swt.layout;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.view.swt.internal.layout;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
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"
+ org.eclipse.swt.widgets;version="0.0.0",
+ org.osgi.service.component.annotations;version="1.2.0"
+Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.swt.internal.layout.ECPLayoutProvider.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/OSGI-INF/org.eclipse.emf.ecp.view.swt.internal.layout.ECPLayoutProvider.xml b/bundles/org.eclipse.emf.ecp.view.swt.layout/OSGI-INF/org.eclipse.emf.ecp.view.swt.internal.layout.ECPLayoutProvider.xml
new file mode 100644
index 0000000..11e6bfd
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/OSGI-INF/org.eclipse.emf.ecp.view.swt.internal.layout.ECPLayoutProvider.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.swt.internal.layout.ECPLayoutProvider">
+ <implementation class="org.eclipse.emf.ecp.view.swt.internal.layout.ECPLayoutProvider"/>
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.layout.LayoutProvider"/>
+ </service>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/build.properties b/bundles/org.eclipse.emf.ecp.view.swt.layout/build.properties
index e5a949c..9a118b8 100644
--- a/bundles/org.eclipse.emf.ecp.view.swt.layout/build.properties
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/build.properties
@@ -1,7 +1,8 @@
-source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
- about.html
+ about.html,\
+ OSGI-INF/
src.includes = about.html
+source.. = src/
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 90aaf84..d950f22 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.swt.layout/src/org/eclipse/emf/ecp/view/swt/internal/layout/ECPLayoutProvider.java b/bundles/org.eclipse.emf.ecp.view.swt.layout/src/org/eclipse/emf/ecp/view/swt/internal/layout/ECPLayoutProvider.java
index 3ac7645..f38cdc1 100644
--- a/bundles/org.eclipse.emf.ecp.view.swt.layout/src/org/eclipse/emf/ecp/view/swt/internal/layout/ECPLayoutProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.swt.layout/src/org/eclipse/emf/ecp/view/swt/internal/layout/ECPLayoutProvider.java
@@ -14,6 +14,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecp.view.spi.model.VElement;
import org.eclipse.emf.ecp.view.spi.swt.layout.AbstractLayoutProvider;
+import org.eclipse.emfforms.spi.swt.core.layout.LayoutProvider;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridCell;
import org.eclipse.emfforms.spi.swt.core.layout.SWTGridDescription;
import org.eclipse.jface.layout.GridDataFactory;
@@ -23,6 +24,7 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Layout;
+import org.osgi.service.component.annotations.Component;
/**
* A default layout provider.
@@ -30,6 +32,7 @@
* @author Eugen Neufeld
*
*/
+@Component(service = LayoutProvider.class)
public class ECPLayoutProvider extends AbstractLayoutProvider {
/**
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 81c9876..173a7b4 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.table.celleditor.rcp;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.jface;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.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 5ce436a..4b85f51 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/src/org/eclipse/emf/ecp/view/spi/table/celleditor/rcp/NativeWidgetHelper.java b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/src/org/eclipse/emf/ecp/view/spi/table/celleditor/rcp/NativeWidgetHelper.java
index f9f5f78..30f423b 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/src/org/eclipse/emf/ecp/view/spi/table/celleditor/rcp/NativeWidgetHelper.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.celleditor.rcp/src/org/eclipse/emf/ecp/view/spi/table/celleditor/rcp/NativeWidgetHelper.java
@@ -24,6 +24,8 @@
*******************************************************************************/
package org.eclipse.emf.ecp.view.spi.table.celleditor.rcp;
+import java.util.concurrent.Semaphore;
+
import org.eclipse.emf.ecp.view.spi.util.swt.ImageRegistryService;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -33,6 +35,7 @@
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
@@ -52,6 +55,9 @@
private static final String CHECKED_DEFAULT = "icons/checked.png"; //$NON-NLS-1$
private static final String UNCHECKED_DEFAULT = "icons/unchecked.png"; //$NON-NLS-1$
+ private static final Semaphore LOCK = new Semaphore(1, true);
+ private static boolean initalized;
+
private static ServiceReference<ImageRegistryService> imageRegistryServiceReference;
private static ImageData checked;
@@ -69,8 +75,18 @@
* create the screen shots
*/
public static void initCheckBoxImages(Control control) {
- createCheckBoxImage(control, true);
- createCheckBoxImage(control, false);
+ try {
+ LOCK.acquire();
+ } catch (final InterruptedException ex) {
+ if (initalized) {
+ return;
+ }
+ createCheckBoxImage(control, true);
+ createCheckBoxImage(control, false);
+ initalized = true;
+ } finally {
+ LOCK.release();
+ }
}
/**
@@ -83,22 +99,32 @@
* @return the image
*/
public static Image getCheckBoxImage(Control control, CheckBoxState state) {
- switch (state) {
- case checked:
- if (checked != null) {
- return new Image(control.getDisplay(), checked);
- }
- return getImage(CHECKED_DEFAULT);
- case unchecked:
- if (unchecked != null) {
- return new Image(control.getDisplay(), unchecked);
- }
- return getImage(UNCHECKED_DEFAULT);
- default:
- return null;
+ try {
+ LOCK.acquire();
+ switch (state) {
+ case checked:
+ if (checked != null) {
+ return new Image(control.getDisplay(), checked);
+ }
+ return getImage(CHECKED_DEFAULT);
+ case unchecked:
+ if (unchecked != null) {
+ return new Image(control.getDisplay(), unchecked);
+ }
+ return getImage(UNCHECKED_DEFAULT);
+ default:
+ break;
+
+ }
+ } catch (final InterruptedException ex) {
+
+ } finally {
+ LOCK.release();
}
+ return null;
+
}
/**
@@ -115,9 +141,12 @@
private static void createCheckBoxImage(Control control, boolean type) {
// Hopefully no platform uses exactly this color because we'll make
// it transparent in the image.
- final Color greenScreen = new Color(control.getDisplay(), 222, 223, 224);
- final Shell shell = new Shell(control.getShell(), SWT.NO_TRIM);
+ final Display display = Display.getDefault();
+ final Color greenScreen = new Color(display, 3, 223, 7);
+
+ final Shell shell = new Shell(control.getShell());
+ ImageData imageData = null;
// otherwise we have a default gray color
shell.setBackground(greenScreen);
@@ -152,12 +181,12 @@
shell.open();
final GC gc = new GC(shell);
- final Image image = new Image(control.getDisplay(), bsize.x, bsize.y);
+ final Image image = new Image(display, bsize.x, bsize.y);
gc.copyArea(image, 0, 0);
gc.dispose();
shell.close();
- final ImageData imageData = image.getImageData();
+ imageData = image.getImageData();
imageData.transparentPixel = imageData.palette.getPixel(greenScreen
.getRGB());
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 d4c5c79..af71164 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.columnservice;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.ui.swt.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 d403754..7dc3286 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1832a9d..36671b0 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.edapt/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Edapt Migration for Table View Model
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.edapt;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.table.edapt._140to150;version="1.12.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 913b4ba..20d1d4c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 16f519e..c7668ca 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 ef2db45..0c6a9ce 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 550e3db..31f70d6 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.model/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.model;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.table.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.generator;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.table.columnservice,org.eclipse.emf.ecp.view.table.editor",
+ org.eclipse.emf.ecp.view.internal.table.model;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.table.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.table.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
org.osgi.service.component.annotations;version="1.2.0"
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 3d96fde..6359595 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
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 3b34e72..cd0c1cc 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,7 +58,7 @@
* @generated
*/
public class TableValidator extends EObjectValidator {
- private static final String VALIDATING_TABLE_CONTROL_KEY = "ValidatingTableControl";
+ private static final String VALIDATING_TABLE_CONTROL_KEY = "ValidatingTableControl"; //$NON-NLS-1$
/**
* The cached model package
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
index e532f39..0d26e7f 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/META-INF/MANIFEST.MF
@@ -2,35 +2,35 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.table.nebula.grid;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.table.nebula.grid;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
org.eclipse.nebula.widgets.grid;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.spi.table.swt;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
index 8bb341f..5c1704d 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCopyKeyListener.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCopyKeyListener.java
index 4e977fc..51fa980 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCopyKeyListener.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCopyKeyListener.java
@@ -33,6 +33,7 @@
*/
public class GridCopyKeyListener implements KeyListener {
private final Clipboard clipboard;
+ private boolean triggerActive;
/**
* Constructor.
@@ -45,12 +46,12 @@
@Override
public void keyPressed(KeyEvent e) {
- // do nothing
+ setTriggerActive((e.stateMask & SWT.CTRL) != 0 && e.keyCode == 'c');
}
@Override
public void keyReleased(KeyEvent e) {
- if ((e.stateMask & SWT.CTRL) != 0 && e.keyCode == 'c') {
+ if (isTriggerActive()) {
final Grid grid = (Grid) e.widget;
copySelectionToClipboard(grid);
}
@@ -123,8 +124,7 @@
}
private String[][] initializeTableSelection(Grid grid, Point[] cellSelection, int columnSize, int rowSize,
- int minColumn,
- int minRow) {
+ 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;
@@ -146,4 +146,20 @@
final String text = item.getText(column);
return text;
}
+
+ /**
+ * @return <code>true</code> if copy was triggered in key pressed
+ */
+ protected boolean isTriggerActive() {
+ return triggerActive;
+ }
+
+ /**
+ * May be called from {@link #keyPressed(KeyEvent)} to indicated whether this triggers the action.
+ *
+ * @param triggerActive <code>true</code> if key release should perform the action, <code>false</code> otherwise
+ */
+ protected void setTriggerActive(boolean triggerActive) {
+ this.triggerActive = triggerActive;
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCutKeyListener.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCutKeyListener.java
index d6db384..6a159e8 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCutKeyListener.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridCutKeyListener.java
@@ -41,14 +41,14 @@
this.dataBinding = dataBinding;
}
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent)
- */
+ @Override
+ public void keyPressed(KeyEvent e) {
+ setTriggerActive((e.stateMask & SWT.CTRL) != 0 && e.keyCode == 'x');
+ }
+
@Override
public void keyReleased(KeyEvent e) {
- if ((e.stateMask & SWT.CTRL) != 0 && e.keyCode == 'x') {
+ if (isTriggerActive()) {
final Grid grid = (Grid) e.widget;
copySelectionToClipboard(grid);
KeyListenerUtil.clearSelection(grid, vControl, dataBinding);
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java
index cd12bbe..005dcc9 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/internal/table/nebula/grid/GridPasteKeyListener.java
@@ -49,6 +49,7 @@
private final VControl vControl;
private boolean selectPastedCells = true;
+ private boolean alreadyPasted;
/**
* Constructor.
@@ -70,18 +71,23 @@
@Override
public void keyPressed(KeyEvent e) {
- // do nothing
+ if ((e.stateMask & SWT.CTRL) != 0 && e.keyCode == 'v') {
+ if (!alreadyPasted) {
+ final Grid grid = (Grid) e.widget;
+ final Object contents = clipboard.getContents(TextTransfer.getInstance());
+ if (contents instanceof String) {
+ pasteSelection(grid, (String) contents);
+ }
+ alreadyPasted = true;
+ }
+ } else {
+ alreadyPasted = false;
+ }
}
@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);
- }
- }
+ /* no op */
}
/**
@@ -97,8 +103,7 @@
}
final List<Point> pastedCells = new ArrayList<Point>();
- if (grid.getCellSelection().length > 1
- && new StringTokenizer(contents, "\n\t", false).countTokens() == 1) { //$NON-NLS-1$
+ if (grid.getCellSelection().length > 1 && new StringTokenizer(contents, "\n\t", false).countTokens() == 1) { //$NON-NLS-1$
// fill selection
for (final Point startItem : grid.getCellSelection()) {
@@ -168,8 +173,8 @@
try {
value = dataBinding.getObservableValue(dmr, eObject);
- final Object convertedValue = converterService
- .convertToModelValue(eObject, (EStructuralFeature) value.getValueType(), cellValue);
+ final Object convertedValue = converterService.convertToModelValue(eObject,
+ (EStructuralFeature) value.getValueType(), cellValue);
if (convertedValue != null) {
value.setValue(convertedValue);
pastedValues.add(value);
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
index f4a331e..64e9f50 100644
--- 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
@@ -119,6 +119,11 @@
public int getHeaderHeight() {
return getTableViewer().getGrid().getHeaderHeight();
}
+
+ @Override
+ public int getItemCount() {
+ return getTableViewer().getGrid().getItemCount();
+ }
};
}
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
index a8772d7..fd99b9a 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table UI RCP
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.rcp
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.ui.rcp;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.table.ui.rcp;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
org.osgi.service.component.annotations;version="1.2.0";resolution:=optional
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
index ea6826c..5b390d9 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.rcp/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
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
index c49c85a..12a4141 100644
--- 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
@@ -42,6 +42,9 @@
*
*/
public class TableControlDetailDialogRCPRenderer extends TableControlDetailDialogSWTRenderer {
+
+ private CutCopyPasteListener cutCopyPasteListener;
+
/**
* Default constructor.
*
@@ -89,7 +92,7 @@
final EditingDomain editingDomain = getEditingDomain(getViewModelContext().getDomainModel());
final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
getViewModelContext().getDomainModel());
- TableControlRCPRenderer.enableCutCopyPaste(tableViewer, editingDomain, setting);
+ cutCopyPasteListener = TableControlRCPRenderer.enableCutCopyPaste(tableViewer, editingDomain, setting);
} catch (final DatabindingFailedException ex) {
getReportService().report(new AbstractReport(ex, "Enabling Cut Copy Paste failed")); //$NON-NLS-1$
}
@@ -97,4 +100,12 @@
return control;
}
+ @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.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
index 4e4870d..9d8016d 100644
--- 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
@@ -42,6 +42,9 @@
*
*/
public class TableControlDetailPanelRCPRenderer extends TableControlDetailPanelRenderer {
+
+ private CutCopyPasteListener cutCopyPasteListener;
+
/**
* Default constructor.
*
@@ -89,11 +92,19 @@
final EditingDomain editingDomain = getEditingDomain(getViewModelContext().getDomainModel());
final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
getViewModelContext().getDomainModel());
- TableControlRCPRenderer.enableCutCopyPaste(tableViewer, editingDomain, setting);
+ cutCopyPasteListener = TableControlRCPRenderer.enableCutCopyPaste(tableViewer, editingDomain, setting);
} catch (final DatabindingFailedException ex) {
getReportService().report(new AbstractReport(ex, "Enabling Cut Copy Paste failed")); //$NON-NLS-1$
}
}
return control;
}
+
+ @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.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
index 5163608..9b82a45 100644
--- 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
@@ -44,7 +44,7 @@
*/
public class TableControlRCPRenderer extends TableControlSWTRenderer {
- private static CutCopyPasteListener cutCopyPasteListener;
+ private CutCopyPasteListener cutCopyPasteListener;
/**
* Default constructor.
@@ -93,7 +93,7 @@
final EditingDomain editingDomain = getEditingDomain(getViewModelContext().getDomainModel());
final Setting setting = getEMFFormsDatabinding().getSetting(getDMRToMultiReference(),
getViewModelContext().getDomainModel());
- enableCutCopyPaste(tableViewer, editingDomain, setting);
+ cutCopyPasteListener = enableCutCopyPaste(tableViewer, editingDomain, setting);
} catch (final DatabindingFailedException ex) {
getReportService().report(new AbstractReport(ex, "Enabling Cut Copy Paste failed")); //$NON-NLS-1$
}
@@ -107,13 +107,14 @@
* @param tableViewer the {@link TableViewer}
* @param editingDomain the {@link EditingDomain}
* @param setting the {@link Setting} displayed in the table
+ * @return the {@link CutCopyPasteListener} or <code>null</code>
*/
- static void enableCutCopyPaste(AbstractTableViewer tableViewer, EditingDomain editingDomain,
+ static CutCopyPasteListener enableCutCopyPaste(AbstractTableViewer tableViewer, EditingDomain editingDomain,
Setting setting) {
if (!TableViewer.class.isInstance(tableViewer)) {
- return;
+ return null;
}
- cutCopyPasteListener = new CutCopyPasteListener((TableViewer) tableViewer, editingDomain, setting);
+ return new CutCopyPasteListener((TableViewer) tableViewer, editingDomain, setting);
}
@Override
@@ -122,7 +123,6 @@
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 8e852e7..b88ae38 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.internal.view.table.ui.swt.persistedstate;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.spi.view.table.ui.swt.persistedstate;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
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 7864080..9d5fd1b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/META-INF/MANIFEST.MF
index d6ebe4b..6283d16 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,36 +2,36 @@
Bundle-ManifestVersion: 2
Bundle-Name: Table UI SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.view.table.ui.swt
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test",
- org.eclipse.emf.ecp.view.spi.table.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.table.swt;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test",
+ org.eclipse.emf.ecp.view.spi.table.swt;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/tableDetailDialogRendererService.xml,OSGI-INF/tableDetailPanelRendererService.xml,OSGI-INF/tableRendererService.xml
Bundle-ActivationPolicy: lazy
Import-Package: javax.inject;version="1.0.0",
org.eclipse.emf.edit.ui.dnd;version="0.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.dialogs;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/pom.xml
index 8921023..7cd142f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
index 722c188..d432a7d 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
@@ -203,6 +203,7 @@
private AbstractTableViewer tableViewer;
private Label validationIcon;
+ private boolean showValidationSummaryTooltip;
private Button addButton;
private Button removeButton;
@@ -562,11 +563,19 @@
if (validationControls.size() == 1 && Label.class.isInstance(validationControls.get(0))) {
validationIcon = (Label) validationControls.get(0);
}
+
+ final VTTableStyleProperty tableStyleProperty = getTableStyleProperty();
+ showValidationSummaryTooltip = tableStyleProperty.isShowValidationSummaryTooltip();
}
}
private void setupSorting(final ECPTableViewerComparator comparator, int regularColumnsStartIndex,
final AbstractTableViewerComposite tableViewerComposite) {
+
+ final VTTableStyleProperty tableStyleProperty = getTableStyleProperty();
+ if (!tableStyleProperty.isEnableSorting()) {
+ return;
+ }
final int length = tableViewerComposite.getColumns().length;
final List<Integer> sortableColumns = new ArrayList<Integer>();
for (int i = 0; i < length; i++) {
@@ -716,7 +725,7 @@
}
final int itemHeight = table.getItemHeight();
// show one empty row if table does not contain any items
- final int itemCount = Math.max(table.getItemHeight(), 1);
+ final int itemCount = Math.max(table.getItemCount(), 1);
final int headerHeight = table.getHeaderVisible() ? table.getHeaderHeight() : 0;
// 4px needed as a buffer to avoid scrollbars
final int tableHeight = itemHeight * itemCount + headerHeight + 4;
@@ -867,12 +876,12 @@
private VTTableStyleProperty getTableStyleProperty() {
VTTableStyleProperty styleProperty = getStyleProperty(VTTableStyleProperty.class);
if (styleProperty == null) {
- styleProperty = getDefaultTableStylProperty();
+ styleProperty = getDefaultTableStyleProperty();
}
return styleProperty;
}
- private VTTableStyleProperty getDefaultTableStylProperty() {
+ private VTTableStyleProperty getDefaultTableStyleProperty() {
final VTTableStyleProperty tableStyleProperty = VTTableStylePropertyFactory.eINSTANCE
.createTableStyleProperty();
tableStyleProperty.setMaximumHeight(200);
@@ -1283,7 +1292,7 @@
/**
* Checks whether an element is editable or not.
- *
+ *
* @param element The list entry to be checked
* @return True if the element can be edited, false otherwise
*
@@ -1294,6 +1303,51 @@
}
/**
+ * Defined whether a cell editor should be created or not.
+ *
+ * @param element The table entry to be checked
+ * @return True if a CellEditor should be created, false otherwise
+ * @since 1.12
+ */
+ protected boolean shouldCreateCellEditor(Object element) {
+ final boolean isObjectEditable = canEditObject(element);
+ if (!isObjectEditable) {
+ return false;
+ }
+ final boolean editable = getVElement().isEnabled()
+ && !getVElement().isReadonly();
+ return editable;
+ }
+
+ /**
+ * Called by the {@link TableControlEditingSupportAndLabelProvider}.
+ *
+ * @param feature the feature of the column
+ * @param cellEditor the cell editor for the column
+ * @param attributeMap the attribute map displayed in the table
+ * @param vTableControl the table view model element
+ * @param dmr the domain model reference of the column
+ * @param table the table control
+ * @return the {@link CellLabelProvider} of the column
+ * @since 1.12
+ */
+ protected CellLabelProvider createCellLabelProvider(
+ EStructuralFeature feature,
+ CellEditor cellEditor,
+ IObservableMap attributeMap,
+ VTableControl vTableControl,
+ VDomainModelReference dmr,
+ Control table) {
+ return new ECPCellLabelProvider(
+ feature,
+ cellEditor,
+ attributeMap,
+ getVElement(),
+ dmr,
+ table);
+ }
+
+ /**
* The {@link DNDProvider} for this renderer.
*
* @author Johannes Faltermeier
@@ -1515,9 +1569,8 @@
observableValue.dispose();
validationIcon.setImage(getValidationIcon(getVElement().getDiagnostic().getHighestSeverity()));
+ showValidationSummaryTooltip(showValidationSummaryTooltip);
- validationIcon.setToolTipText(ECPTooltipModifierHelper.modifyString(getVElement().getDiagnostic()
- .getMessage(), null));
final Collection<?> collection = (Collection<?>) eObject.eGet(structuralFeature, true);
if (!collection.isEmpty()) {
for (final Object object : collection) {
@@ -1525,6 +1578,14 @@
}
}
}
+
+ // extracted in order to avoid checkstyle complexity warning
+ private void showValidationSummaryTooltip(boolean doShow) {
+ if (doShow) {
+ validationIcon.setToolTipText(ECPTooltipModifierHelper.modifyString(getVElement().getDiagnostic()
+ .getMessage(), null));
+ }
+ }
}
/**
@@ -1535,7 +1596,7 @@
* @author Johannes Faltermeier
*
*/
- private final class TableControlEditingSupportAndLabelProvider
+ protected final class TableControlEditingSupportAndLabelProvider
implements EditingSupportCreator, CellLabelProviderFactory {
private final InternalEObject tempInstance;
private final EStructuralFeature eStructuralFeature;
@@ -1574,8 +1635,7 @@
if (ECPCellEditorComparator.class.isInstance(cellEditor)) {
columnIndexToComparatorMap.put(indexOfColumn, ECPCellEditorComparator.class.cast(cellEditor));
}
- observableSupport = new ECPTableEditingSupport(tableViewer, cellEditor,
- getVElement(), dmr, valueProperty);
+ observableSupport = new ECPTableEditingSupport(tableViewer, cellEditor, dmr, valueProperty);
initialized = true;
}
@@ -1584,7 +1644,7 @@
if (!initialized) {
init(table);
}
- return new ECPCellLabelProvider(eStructuralFeature, cellEditor, observableMap,
+ return TableControlSWTRenderer.this.createCellLabelProvider(eStructuralFeature, cellEditor, observableMap,
getVElement(), dmr, table.getControl());
}
}
@@ -1891,7 +1951,11 @@
if (value == null) {
return null;
}
- return ECPTooltipModifierHelper.modifyString(String.valueOf(value), setting);
+ final String tooltip = ECPTooltipModifierHelper.modifyString(String.valueOf(value), setting);
+ if (tooltip == null || tooltip.isEmpty()) {
+ return null;
+ }
+ return tooltip;
}
@Override
@@ -1951,8 +2015,6 @@
private final CellEditor cellEditor;
- private final VTableControl tableControl;
-
private final IValueProperty valueProperty;
private final VDomainModelReference domainModelReference;
@@ -1960,11 +2022,10 @@
/**
* @param viewer
*/
- ECPTableEditingSupport(ColumnViewer viewer, CellEditor cellEditor,
- VTableControl tableControl, VDomainModelReference domainModelReference, IValueProperty valueProperty) {
+ ECPTableEditingSupport(ColumnViewer viewer, CellEditor cellEditor, VDomainModelReference domainModelReference,
+ IValueProperty valueProperty) {
super(viewer);
this.cellEditor = cellEditor;
- this.tableControl = tableControl;
this.valueProperty = valueProperty;
this.domainModelReference = domainModelReference;
}
@@ -1980,13 +2041,7 @@
*/
@Override
protected boolean canEdit(Object element) {
- final boolean isObjectEditable = canEditObject(element);
- if (!isObjectEditable) {
- return false;
- }
- boolean editable = tableControl.isEnabled()
- && !tableControl.isReadonly();
- if (!editable) {
+ if (!shouldCreateCellEditor(element)) {
return false;
}
final IObservableValue observableValue = valueProperty.observe(element);
@@ -1994,7 +2049,7 @@
final EStructuralFeature structuralFeature = (EStructuralFeature) observableValue.getValueType();
final Setting setting = ((InternalEObject) eObject).eSetting(structuralFeature);
- editable &= emfFormsEditSupport.canSetProperty(domainModelReference, (EObject) element);
+ boolean editable = emfFormsEditSupport.canSetProperty(domainModelReference, (EObject) element);
editable &= !CellReadOnlyTesterHelper.getInstance().isReadOnly(getVElement(), setting);
if (ECPCellEditor.class.isInstance(cellEditor)) {
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 ef9135c..f55b3f0 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.table.internal.validation;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 4df5d06..c145408 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.view.template.model.edit/META-INF/MANIFEST.MF
index 406ca41..aaf1ac7 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tab.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.provider;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 5197591..f9f3e81 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
@@ -218,3 +218,6 @@
_UI_TabStyleProperty_warningImageURL_feature = Warning Image URL
_UI_TabStyleProperty_errorImageURL_feature = Error Image URL
_UI_TabStyleProperty_cancelImageURL_feature = Cancel Image URL
+_UI_TableStyleProperty_showValidationSummaryPopupTooltip_feature = Show Validation Summary Popup Tooltip
+_UI_TableStyleProperty_showValidationSummaryTooltip_feature = Show Validation Summary Tooltip
+_UI_TableStyleProperty_enableSorting_feature = Enable Sorting
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 990d65a..7abbecb 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TabStyleEditPlugin.java b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TabStyleEditPlugin.java
index f42c65a..c0c72be 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TabStyleEditPlugin.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TabStyleEditPlugin.java
@@ -19,7 +19,6 @@
* This is the central singleton for the TabStyle edit plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public final class TabStyleEditPlugin extends EMFPlugin {
@@ -27,7 +26,6 @@
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static final TabStyleEditPlugin INSTANCE = new TabStyleEditPlugin();
@@ -36,7 +34,6 @@
* Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private static Implementation plugin;
@@ -45,20 +42,19 @@
* Create the instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public TabStyleEditPlugin() {
- super(new ResourceLocator[] {
- TemplateEditPlugin.INSTANCE,
- });
+ super
+ (new ResourceLocator [] {
+ TemplateEditPlugin.INSTANCE,
+ });
}
/**
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the singleton instance.
* @generated
*/
@@ -71,7 +67,6 @@
* Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the singleton instance.
* @generated
*/
@@ -83,7 +78,6 @@
* The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static class Implementation extends EclipsePlugin {
@@ -91,7 +85,6 @@
* Creates an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public Implementation() {
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java
index 44bb4a4..0c43abd 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProvider.java
@@ -32,11 +32,9 @@
import org.eclipse.emf.edit.provider.ViewerNotification;
/**
- * This is the item provider adapter for a
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty} object.
+ * This is the item provider adapter for a {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public class TableStylePropertyItemProvider
@@ -51,7 +49,6 @@
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public TableStylePropertyItemProvider(AdapterFactory adapterFactory) {
@@ -62,7 +59,6 @@
* This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -72,6 +68,8 @@
addMinimumHeightPropertyDescriptor(object);
addMaximumHeightPropertyDescriptor(object);
+ addShowValidationSummaryTooltipPropertyDescriptor(object);
+ addEnableSortingPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -80,53 +78,94 @@
* This adds a property descriptor for the Minimum Height feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected void addMinimumHeightPropertyDescriptor(Object object) {
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_TableStyleProperty_minimumHeight_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TableStyleProperty_minimumHeight_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_TableStyleProperty_type"), //$NON-NLS-1$
- VTTableStylePropertyPackage.Literals.TABLE_STYLE_PROPERTY__MINIMUM_HEIGHT,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TableStyleProperty_minimumHeight_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TableStyleProperty_minimumHeight_feature", "_UI_TableStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VTTableStylePropertyPackage.Literals.TABLE_STYLE_PROPERTY__MINIMUM_HEIGHT,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+ null,
+ null));
}
/**
* This adds a property descriptor for the Maximum Height feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected void addMaximumHeightPropertyDescriptor(Object object) {
- itemPropertyDescriptors
- .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_TableStyleProperty_maximumHeight_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TableStyleProperty_maximumHeight_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_TableStyleProperty_type"), //$NON-NLS-1$
- VTTableStylePropertyPackage.Literals.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TableStyleProperty_maximumHeight_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TableStyleProperty_maximumHeight_feature", "_UI_TableStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VTTableStylePropertyPackage.Literals.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Show Validation Summary Tooltip feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addShowValidationSummaryTooltipPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TableStyleProperty_showValidationSummaryTooltip_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TableStyleProperty_showValidationSummaryTooltip_feature", "_UI_TableStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VTTableStylePropertyPackage.Literals.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Enable Sorting feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addEnableSortingPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_TableStyleProperty_enableSorting_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TableStyleProperty_enableSorting_feature", "_UI_TableStyleProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VTTableStylePropertyPackage.Literals.TABLE_STYLE_PROPERTY__ENABLE_SORTING,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+ null,
+ null));
}
/**
* This returns TableStyleProperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -138,12 +177,11 @@
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public String getText(Object object) {
- final VTTableStyleProperty tableStyleProperty = (VTTableStyleProperty) object;
+ VTTableStyleProperty tableStyleProperty = (VTTableStyleProperty)object;
return getString("_UI_TableStyleProperty_type") + " " + tableStyleProperty.getMinimumHeight(); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -152,7 +190,6 @@
* children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -160,10 +197,12 @@
updateChildren(notification);
switch (notification.getFeatureID(VTTableStyleProperty.class)) {
- case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MINIMUM_HEIGHT:
- case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MINIMUM_HEIGHT:
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT:
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP:
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
}
super.notifyChanged(notification);
}
@@ -173,7 +212,6 @@
* that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -185,12 +223,11 @@
* 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();
+ return ((IChildCreationExtender)adapterFactory).getResourceLocator();
}
}
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProviderAdapterFactory.java
index 4567cb6..c841ec9 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model.edit/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/provider/TableStylePropertyItemProviderAdapterFactory.java
@@ -44,13 +44,11 @@
/**
* 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 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 TableStylePropertyItemProviderAdapterFactory extends TableStylePropertyAdapterFactory
@@ -59,7 +57,6 @@
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected ComposedAdapterFactory parentAdapterFactory;
@@ -68,7 +65,6 @@
* This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -77,17 +73,14 @@
* This helps manage the child creation extenders.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(
- TabStyleEditPlugin.INSTANCE, VTTableStylePropertyPackage.eNS_URI);
+ protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(TabStyleEditPlugin.INSTANCE, VTTableStylePropertyPackage.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>();
@@ -96,7 +89,6 @@
* This constructs an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public TableStylePropertyItemProviderAdapterFactory() {
@@ -108,21 +100,17 @@
}
/**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty} instances.
+ * This keeps track of the one adapter used for all {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TableStylePropertyItemProvider tableStylePropertyItemProvider;
/**
- * This creates an adapter for a
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty}.
+ * This creates an adapter for a {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -138,7 +126,6 @@
* This returns the root adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -150,7 +137,6 @@
* This sets the composed adapter factory that contains this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -161,7 +147,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -173,7 +158,6 @@
* This implementation substitutes the factory itself as the key for the adapter.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -184,14 +168,13 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public Object adapt(Object object, Object type) {
if (isFactoryForType(type)) {
- final Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
+ Object adapter = super.adapt(object, type);
+ if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
return adapter;
}
}
@@ -202,7 +185,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public List<IChildCreationExtender> getChildCreationExtenders() {
@@ -212,7 +194,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -223,7 +204,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -235,7 +215,6 @@
* This adds a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -247,7 +226,6 @@
* This removes a listener.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -259,7 +237,6 @@
* This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -272,24 +249,20 @@
}
/**
- * This disposes all of the item providers created by this factory.
+ * This disposes all of the item providers created by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public void dispose() {
- if (tableStylePropertyItemProvider != null) {
- tableStylePropertyItemProvider.dispose();
- }
+ if (tableStylePropertyItemProvider != null) tableStylePropertyItemProvider.dispose();
}
/**
* A child creation extender for the {@link VTTemplatePackage}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static class TemplateChildCreationExtender implements IChildCreationExtender {
@@ -297,7 +270,6 @@
* The switch for creating child descriptors specific to each extended class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected static class CreationSwitch extends TemplateSwitch<Object> {
@@ -305,7 +277,6 @@
* The child descriptors being populated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected List<Object> newChildDescriptors;
@@ -314,7 +285,6 @@
* The domain in which to create the children.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected EditingDomain editingDomain;
@@ -323,7 +293,6 @@
* Creates the a switch for populating child descriptors in the given domain.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
@@ -334,13 +303,14 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public Object caseStyle(VTStyle object) {
- newChildDescriptors.add(createChildParameter(VTTemplatePackage.Literals.STYLE__PROPERTIES,
- VTTableStylePropertyFactory.eINSTANCE.createTableStyleProperty()));
+ newChildDescriptors.add
+ (createChildParameter
+ (VTTemplatePackage.Literals.STYLE__PROPERTIES,
+ VTTableStylePropertyFactory.eINSTANCE.createTableStyleProperty()));
return null;
}
@@ -348,7 +318,6 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected CommandParameter createChildParameter(Object feature, Object child) {
@@ -360,20 +329,18 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
- final ArrayList<Object> result = new ArrayList<Object>();
- new CreationSwitch(result, editingDomain).doSwitch((EObject) object);
+ ArrayList<Object> result = new ArrayList<Object>();
+ new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
return result;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters
index ce8de43..e6bcf7e 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
@@ -7,6 +7,12 @@
<message_argument value="1.9.0"/>
</message_arguments>
</filter>
+ <filter comment="Model Additions in 1.12" id="923795461">
+ <message_arguments>
+ <message_argument value="1.12.0"/>
+ <message_argument value="1.11.0"/>
+ </message_arguments>
+ </filter>
<filter comment="SPI Change in 1.6" id="923795461">
<message_arguments>
<message_argument value="1.6.0"/>
@@ -462,6 +468,79 @@
</message_arguments>
</filter>
</resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java" type="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty">
+ <filter comment="SPI Changes for 1.12" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+ <message_argument value="isEnableSorting()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Model Additions in 1.12" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+ <message_argument value="isShowValidationSummaryTooltip()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Changes for 1.12" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+ <message_argument value="setEnableSorting(boolean)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Model Additions in 1.12" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty"/>
+ <message_argument value="setShowValidationSummaryTooltip(boolean)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java" type="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage">
+ <filter comment="Model Additions in 1.12" id="388194388">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+ <message_argument value="TABLE_STYLE_PROPERTY_FEATURE_COUNT"/>
+ <message_argument value="2"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Changes for 1.12" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+ <message_argument value="TABLE_STYLE_PROPERTY__ENABLE_SORTING"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Model Additions in 1.12" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+ <message_argument value="TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP"/>
+ </message_arguments>
+ </filter>
+ <filter comment="SPI Changes for 1.12" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+ <message_argument value="getTableStyleProperty_EnableSorting()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Model Additions in 1.12" id="403804204">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage"/>
+ <message_argument value="getTableStyleProperty_ShowValidationSummaryTooltip()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java" type="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage$Literals">
+ <filter comment="SPI Changes for 1.12" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage.Literals"/>
+ <message_argument value="TABLE_STYLE_PROPERTY__ENABLE_SORTING"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Model Additions in 1.12" id="403767336">
+ <message_arguments>
+ <message_argument value="org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage.Literals"/>
+ <message_argument value="TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP"/>
+ </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>
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 592223a..6ce6d44 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,62 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.template.model;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.background.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tab.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="1.11.0",
- org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
+Export-Package: org.eclipse.emf.ecp.internal.view.template.model;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.selector.domainmodelreference.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.selector.viewModelElement.model.util;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.alignment.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.alignment.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.background.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.background.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.background.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.fontProperties.model.util;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.mandatory.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tab.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.tab.model.util;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.tableValidation.model.util;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.textControlEnablement.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.template.style.validation.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.style.validation.model.util;version="1.12.0";
+ x-friends:="org.eclipse.emf.ecp.view.template.model.edit"
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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore b/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore
index 4387795..de933a1 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.ecore
@@ -7,5 +7,9 @@
unsettable="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="maximumHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
unsettable="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="showValidationSummaryTooltip"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enableSorting" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
+ defaultValueLiteral="true"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.genmodel b/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.genmodel
index a0feb44..5ec4a96 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.genmodel
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/model/tableStyleProperty.genmodel
@@ -15,6 +15,7 @@
<genClasses ecoreClass="tableStyleProperty.ecore#//TableStyleProperty">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute tableStyleProperty.ecore#//TableStyleProperty/minimumHeight"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute tableStyleProperty.ecore#//TableStyleProperty/maximumHeight"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tableStyleProperty.ecore#//TableStyleProperty/showValidationSummaryTooltip"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
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 2e72f20..4d7ed0a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java
index 4bfc2f4..7f6f468 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStyleProperty.java
@@ -16,7 +16,7 @@
/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>Table Style Property</b></em>'.
- *
+ *
* @since 1.9
* <!-- end-user-doc -->
*
@@ -24,12 +24,14 @@
* The following features are supported:
* </p>
* <ul>
- * <li>
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
* <em>Minimum Height</em>}</li>
- * <li>
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
* <em>Maximum Height</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isShowValidationSummaryTooltip
+ * <em>Show Validation Summary Tooltip</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isEnableSorting
+ * <em>Enable Sorting</em>}</li>
* </ul>
*
* @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage#getTableStyleProperty()
@@ -57,8 +59,8 @@
int getMinimumHeight();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
* <em>Minimum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -72,8 +74,8 @@
void setMinimumHeight(int value);
/**
- * Unsets the value of the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
+ * Unsets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
* <em>Minimum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -86,8 +88,8 @@
void unsetMinimumHeight();
/**
- * Returns whether the value of the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
+ * Returns whether the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
* <em>Minimum Height</em>}' attribute is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -120,8 +122,8 @@
int getMaximumHeight();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
* <em>Maximum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -135,8 +137,8 @@
void setMaximumHeight(int value);
/**
- * Unsets the value of the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
+ * Unsets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
* <em>Maximum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -149,8 +151,8 @@
void unsetMaximumHeight();
/**
- * Returns whether the value of the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
+ * Returns whether the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
* <em>Maximum Height</em>}' attribute is set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -163,4 +165,71 @@
*/
boolean isSetMaximumHeight();
+ /**
+ * Returns the value of the '<em><b>Show Validation Summary Tooltip</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Show Validation Summary Tooltip</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Show Validation Summary Tooltip</em>' attribute.
+ * @see #setShowValidationSummaryTooltip(boolean)
+ * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage#getTableStyleProperty_ShowValidationSummaryTooltip()
+ * @model
+ * @generated
+ */
+ boolean isShowValidationSummaryTooltip();
+
+ /**
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isShowValidationSummaryTooltip
+ * <em>Show Validation Summary Tooltip</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Show Validation Summary Tooltip</em>' attribute.
+ * @see #isShowValidationSummaryTooltip()
+ * @generated
+ */
+ void setShowValidationSummaryTooltip(boolean value);
+
+ /**
+ * Returns the value of the '<em><b>Enable Sorting</b></em>' attribute.
+ * The default value is <code>"true"</code>.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Enable Sorting</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Enable Sorting</em>' attribute.
+ * @see #setEnableSorting(boolean)
+ * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage#getTableStyleProperty_EnableSorting()
+ * @model default="true"
+ * @generated
+ */
+ boolean isEnableSorting();
+
+ /**
+ * Sets the value of the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isEnableSorting
+ * <em>Enable Sorting</em>}' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Enable Sorting</em>' attribute.
+ * @see #isEnableSorting()
+ * @generated
+ */
+ void setEnableSorting(boolean value);
+
} // VTTableStyleProperty
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyFactory.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyFactory.java
index c0f22e7..740c7b1 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyFactory.java
@@ -20,7 +20,6 @@
*
* @since 1.9
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage
* @generated
*/
@@ -29,17 +28,14 @@
* The singleton instance of the factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- VTTableStylePropertyFactory eINSTANCE = org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyFactoryImpl
- .init();
+ VTTableStylePropertyFactory eINSTANCE = org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyFactoryImpl.init();
/**
* Returns a new object of class '<em>Table Style Property</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return a new object of class '<em>Table Style Property</em>'.
* @generated
*/
@@ -49,7 +45,6 @@
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the package supported by this factory.
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java
index 8fd3b4b..ea82a1e 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/VTTableStylePropertyPackage.java
@@ -27,10 +27,9 @@
* <li>each enum,</li>
* <li>and each data type</li>
* </ul>
- *
+ *
* @since 1.9
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyFactory
* @model kind="package"
* @generated
@@ -74,9 +73,9 @@
.init();
/**
- * The meta object id for the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl
- * <em>Table Style Property</em>}' class.
+ * The meta object id for the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl <em>Table
+ * Style Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -107,14 +106,38 @@
int TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Table Style Property</em>' class.
+ * The feature id for the '<em><b>Show Validation Summary Tooltip</b></em>' attribute.
* <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Enable Sorting</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int TABLE_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 2;
+ int TABLE_STYLE_PROPERTY__ENABLE_SORTING = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 3;
+
+ /**
+ * The number of structural features of the '<em>Table Style Property</em>' class.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int TABLE_STYLE_PROPERTY_FEATURE_COUNT = VTTemplatePackage.STYLE_PROPERTY_FEATURE_COUNT + 4;
/**
* The number of operations of the '<em>Table Style Property</em>' class.
@@ -127,9 +150,9 @@
int TABLE_STYLE_PROPERTY_OPERATION_COUNT = VTTemplatePackage.STYLE_PROPERTY_OPERATION_COUNT + 0;
/**
- * Returns the meta object for class '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty
- * <em>Table Style Property</em>}'.
+ * Returns the meta object for class
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty <em>Table Style
+ * Property</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -140,8 +163,8 @@
EClass getTableStyleProperty();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMinimumHeight
* <em>Minimum Height</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -154,8 +177,8 @@
EAttribute getTableStyleProperty_MinimumHeight();
/**
- * Returns the meta object for the attribute '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#getMaximumHeight
* <em>Maximum Height</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -168,6 +191,36 @@
EAttribute getTableStyleProperty_MaximumHeight();
/**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isShowValidationSummaryTooltip
+ * <em>Show Validation Summary Tooltip</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Show Validation Summary Tooltip</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isShowValidationSummaryTooltip()
+ * @see #getTableStyleProperty()
+ * @generated
+ */
+ EAttribute getTableStyleProperty_ShowValidationSummaryTooltip();
+
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isEnableSorting
+ * <em>Enable Sorting</em>}'.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Enable Sorting</em>'.
+ * @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty#isEnableSorting()
+ * @see #getTableStyleProperty()
+ * @generated
+ */
+ EAttribute getTableStyleProperty_EnableSorting();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -193,8 +246,8 @@
*/
interface Literals {
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl
+ * The meta object literal for the
+ * '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl
* <em>Table Style Property</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -223,6 +276,27 @@
*/
EAttribute TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT = eINSTANCE.getTableStyleProperty_MaximumHeight();
+ /**
+ * The meta object literal for the '<em><b>Show Validation Summary Tooltip</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP = eINSTANCE
+ .getTableStyleProperty_ShowValidationSummaryTooltip();
+
+ /**
+ * The meta object literal for the '<em><b>Enable Sorting</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ *
+ * @since 1.12
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute TABLE_STYLE_PROPERTY__ENABLE_SORTING = eINSTANCE.getTableStyleProperty_EnableSorting();
+
}
} // VTTableStylePropertyPackage
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyFactoryImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyFactoryImpl.java
index 7c0f648..4697711 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyFactoryImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyFactoryImpl.java
@@ -24,7 +24,6 @@
* <!-- begin-user-doc -->
* An implementation of the model <b>Factory</b>.
* <!-- end-user-doc -->
- *
* @generated
*/
public class VTTableStylePropertyFactoryImpl extends EFactoryImpl implements VTTableStylePropertyFactory {
@@ -32,17 +31,16 @@
* Creates the default factory implementation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static VTTableStylePropertyFactory init() {
try {
- final VTTableStylePropertyFactory theTableStylePropertyFactory = (VTTableStylePropertyFactory) EPackage.Registry.INSTANCE
- .getEFactory(VTTableStylePropertyPackage.eNS_URI);
+ VTTableStylePropertyFactory theTableStylePropertyFactory = (VTTableStylePropertyFactory)EPackage.Registry.INSTANCE.getEFactory(VTTableStylePropertyPackage.eNS_URI);
if (theTableStylePropertyFactory != null) {
return theTableStylePropertyFactory;
}
- } catch (final Exception exception) {
+ }
+ catch (Exception exception) {
EcorePlugin.INSTANCE.log(exception);
}
return new VTTableStylePropertyFactoryImpl();
@@ -52,7 +50,6 @@
* Creates an instance of the factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public VTTableStylePropertyFactoryImpl() {
@@ -62,46 +59,41 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
- case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY:
- return createTableStyleProperty();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY: return createTableStyleProperty();
+ 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 VTTableStyleProperty createTableStyleProperty() {
- final VTTableStylePropertyImpl tableStyleProperty = new VTTableStylePropertyImpl();
+ VTTableStylePropertyImpl tableStyleProperty = new VTTableStylePropertyImpl();
return tableStyleProperty;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public VTTableStylePropertyPackage getTableStylePropertyPackage() {
- return (VTTableStylePropertyPackage) getEPackage();
+ return (VTTableStylePropertyPackage)getEPackage();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @deprecated
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java
index bbbe3f1..477f2a6 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyImpl.java
@@ -27,12 +27,14 @@
* The following features are implemented:
* </p>
* <ul>
- * <li>
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#getMinimumHeight
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#getMinimumHeight
* <em>Minimum Height</em>}</li>
- * <li>
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#getMaximumHeight
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#getMaximumHeight
* <em>Maximum Height</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#isShowValidationSummaryTooltip
+ * <em>Show Validation Summary Tooltip</em>}</li>
+ * <li>{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.impl.VTTableStylePropertyImpl#isEnableSorting
+ * <em>Enable Sorting</em>}</li>
* </ul>
*
* @generated
@@ -42,7 +44,7 @@
* The default value of the '{@link #getMinimumHeight() <em>Minimum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getMinimumHeight()
* @generated
* @ordered
@@ -53,7 +55,7 @@
* The cached value of the '{@link #getMinimumHeight() <em>Minimum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getMinimumHeight()
* @generated
* @ordered
@@ -64,7 +66,7 @@
* This is true if the Minimum Height attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
@@ -74,7 +76,7 @@
* The default value of the '{@link #getMaximumHeight() <em>Maximum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getMaximumHeight()
* @generated
* @ordered
@@ -85,7 +87,7 @@
* The cached value of the '{@link #getMaximumHeight() <em>Maximum Height</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getMaximumHeight()
* @generated
* @ordered
@@ -96,16 +98,62 @@
* This is true if the Maximum Height attribute has been set.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
protected boolean maximumHeightESet;
/**
+ * The default value of the '{@link #isShowValidationSummaryTooltip() <em>Show Validation Summary Tooltip</em>}'
+ * attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
+ * @see #isShowValidationSummaryTooltip()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean SHOW_VALIDATION_SUMMARY_TOOLTIP_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isShowValidationSummaryTooltip() <em>Show Validation Summary Tooltip</em>}'
+ * attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #isShowValidationSummaryTooltip()
+ * @generated
+ * @ordered
+ */
+ protected boolean showValidationSummaryTooltip = SHOW_VALIDATION_SUMMARY_TOOLTIP_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #isEnableSorting() <em>Enable Sorting</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #isEnableSorting()
+ * @generated
+ * @ordered
+ */
+ protected static final boolean ENABLE_SORTING_EDEFAULT = true;
+
+ /**
+ * The cached value of the '{@link #isEnableSorting() <em>Enable Sorting</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #isEnableSorting()
+ * @generated
+ * @ordered
+ */
+ protected boolean enableSorting = ENABLE_SORTING_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
* @generated
*/
protected VTTableStylePropertyImpl() {
@@ -115,7 +163,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -126,7 +174,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -137,7 +185,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -156,7 +204,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -175,7 +223,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -186,7 +234,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -197,7 +245,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -216,7 +264,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -235,7 +283,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -246,7 +294,62 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
+ * @generated
+ */
+ @Override
+ public boolean isShowValidationSummaryTooltip() {
+ return showValidationSummaryTooltip;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setShowValidationSummaryTooltip(boolean newShowValidationSummaryTooltip) {
+ final boolean oldShowValidationSummaryTooltip = showValidationSummaryTooltip;
+ showValidationSummaryTooltip = newShowValidationSummaryTooltip;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP,
+ oldShowValidationSummaryTooltip, showValidationSummaryTooltip));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean isEnableSorting() {
+ return enableSorting;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setEnableSorting(boolean newEnableSorting) {
+ final boolean oldEnableSorting = enableSorting;
+ enableSorting = newEnableSorting;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING, oldEnableSorting, enableSorting));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -256,6 +359,10 @@
return getMinimumHeight();
case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT:
return getMaximumHeight();
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP:
+ return isShowValidationSummaryTooltip();
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
+ return isEnableSorting();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -263,7 +370,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -275,6 +382,12 @@
case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT:
setMaximumHeight((Integer) newValue);
return;
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP:
+ setShowValidationSummaryTooltip((Boolean) newValue);
+ return;
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
+ setEnableSorting((Boolean) newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -282,7 +395,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -294,6 +407,12 @@
case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT:
unsetMaximumHeight();
return;
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP:
+ setShowValidationSummaryTooltip(SHOW_VALIDATION_SUMMARY_TOOLTIP_EDEFAULT);
+ return;
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
+ setEnableSorting(ENABLE_SORTING_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -301,7 +420,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -311,6 +430,10 @@
return isSetMinimumHeight();
case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT:
return isSetMaximumHeight();
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP:
+ return showValidationSummaryTooltip != SHOW_VALIDATION_SUMMARY_TOOLTIP_EDEFAULT;
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY__ENABLE_SORTING:
+ return enableSorting != ENABLE_SORTING_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -318,7 +441,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -340,6 +463,10 @@
} else {
result.append("<unset>"); //$NON-NLS-1$
}
+ result.append(", showValidationSummaryTooltip: "); //$NON-NLS-1$
+ result.append(showValidationSummaryTooltip);
+ result.append(", enableSorting: "); //$NON-NLS-1$
+ result.append(enableSorting);
result.append(')');
return result.toString();
}
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java
index e7ca14f..f58bdb1 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/impl/VTTableStylePropertyPackageImpl.java
@@ -24,14 +24,14 @@
* <!-- begin-user-doc -->
* An implementation of the model <b>Package</b>.
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public class VTTableStylePropertyPackageImpl extends EPackageImpl implements VTTableStylePropertyPackage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
private EClass tableStylePropertyEClass = null;
@@ -47,7 +47,7 @@
* if one already exists.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage#eNS_URI
* @see #init()
@@ -60,7 +60,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
private static boolean isInited = false;
@@ -73,7 +73,7 @@
* 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()
@@ -112,7 +112,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -123,7 +123,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -134,7 +134,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -145,7 +145,29 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getTableStyleProperty_ShowValidationSummaryTooltip() {
+ return (EAttribute) tableStylePropertyEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getTableStyleProperty_EnableSorting() {
+ return (EAttribute) tableStylePropertyEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
* @generated
*/
@Override
@@ -156,7 +178,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
private boolean isCreated = false;
@@ -166,7 +188,7 @@
* guarded to have no affect on any invocation but its first.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void createPackageContents() {
@@ -179,12 +201,14 @@
tableStylePropertyEClass = createEClass(TABLE_STYLE_PROPERTY);
createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__MINIMUM_HEIGHT);
createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__MAXIMUM_HEIGHT);
+ createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__SHOW_VALIDATION_SUMMARY_TOOLTIP);
+ createEAttribute(tableStylePropertyEClass, TABLE_STYLE_PROPERTY__ENABLE_SORTING);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
private boolean isInitialized = false;
@@ -194,7 +218,7 @@
* method is guarded to have no affect on any invocation but its first.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
public void initializePackageContents() {
@@ -228,6 +252,12 @@
initEAttribute(getTableStyleProperty_MaximumHeight(), ecorePackage.getEInt(), "maximumHeight", null, 0, 1, //$NON-NLS-1$
VTTableStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTableStyleProperty_ShowValidationSummaryTooltip(), ecorePackage.getEBoolean(),
+ "showValidationSummaryTooltip", null, 0, 1, VTTableStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTableStyleProperty_EnableSorting(), ecorePackage.getEBoolean(), "enableSorting", "true", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
+ VTTableStyleProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertyAdapterFactory.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertyAdapterFactory.java
index 036c69a..4e3570a 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertyAdapterFactory.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertyAdapterFactory.java
@@ -24,7 +24,6 @@
* 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.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage
* @generated
*/
@@ -33,7 +32,6 @@
* The cached model package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected static VTTableStylePropertyPackage modelPackage;
@@ -42,7 +40,6 @@
* Creates an instance of the adapter factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public TableStylePropertyAdapterFactory() {
@@ -57,7 +54,6 @@
* 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
*/
@@ -67,7 +63,7 @@
return true;
}
if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
+ return ((EObject)object).eClass().getEPackage() == modelPackage;
}
return false;
}
@@ -76,49 +72,42 @@
* The switch that delegates to the <code>createXXX</code> methods.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TableStylePropertySwitch<Adapter> modelSwitch = new TableStylePropertySwitch<Adapter>() {
- @Override
- public Adapter caseTableStyleProperty(VTTableStyleProperty object) {
- return createTableStylePropertyAdapter();
- }
-
- @Override
- public Adapter caseStyleProperty(VTStyleProperty object) {
- return createStylePropertyAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ @Override
+ public Adapter caseTableStyleProperty(VTTableStyleProperty object) {
+ return createTableStylePropertyAdapter();
+ }
+ @Override
+ public Adapter caseStyleProperty(VTStyleProperty object) {
+ return createStylePropertyAdapter();
+ }
+ @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);
+ return modelSwitch.doSwitch((EObject)target);
}
/**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty
- * <em>Table Style Property</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty <em>Table 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.
* <!-- end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStyleProperty
* @generated
@@ -128,13 +117,11 @@
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.template.model.VTStyleProperty
- * <em>Style Property</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecp.view.template.model.VTStyleProperty <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.
* <!-- end-user-doc -->
- *
* @return the new adapter.
* @see org.eclipse.emf.ecp.view.template.model.VTStyleProperty
* @generated
@@ -148,7 +135,6 @@
* <!-- begin-user-doc -->
* This default implementation returns null.
* <!-- end-user-doc -->
- *
* @return the new adapter.
* @generated
*/
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertySwitch.java b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertySwitch.java
index bf333de..92f4b9e 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertySwitch.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/src/org/eclipse/emf/ecp/view/template/style/tableStyleProperty/model/util/TableStylePropertySwitch.java
@@ -28,7 +28,6 @@
* until a non-null result is returned,
* which is the result of the switch.
* <!-- end-user-doc -->
- *
* @see org.eclipse.emf.ecp.view.template.style.tableStyleProperty.model.VTTableStylePropertyPackage
* @generated
*/
@@ -37,7 +36,6 @@
* The cached model package
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected static VTTableStylePropertyPackage modelPackage;
@@ -46,7 +44,6 @@
* Creates an instance of the switch.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public TableStylePropertySwitch() {
@@ -59,7 +56,6 @@
* 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
@@ -70,30 +66,23 @@
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
- * result.
+ * 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 VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY: {
- final VTTableStyleProperty tableStyleProperty = (VTTableStyleProperty) theEObject;
- T result = caseTableStyleProperty(tableStyleProperty);
- if (result == null) {
- result = caseStyleProperty(tableStyleProperty);
+ case VTTableStylePropertyPackage.TABLE_STYLE_PROPERTY: {
+ VTTableStyleProperty tableStyleProperty = (VTTableStyleProperty)theEObject;
+ T result = caseTableStyleProperty(tableStyleProperty);
+ if (result == null) result = caseStyleProperty(tableStyleProperty);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
}
- if (result == null) {
- result = defaultCase(theEObject);
- }
- return result;
- }
- default:
- return defaultCase(theEObject);
+ default: return defaultCase(theEObject);
}
}
@@ -103,7 +92,6 @@
* 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>Table Style Property</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -119,7 +107,6 @@
* 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>Style Property</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -135,7 +122,6 @@
* 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)
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 513424a..852e6ab 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.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 c9dafb8..c85b719 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7ccda17..5215cf3 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.editor;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.11.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
+Export-Package: org.eclipse.emf.ecp.view.template.internal.tooling;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.controls;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.internal.tooling.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.editor;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.template.tooling.wizards;version="1.12.0";x-friends:="org.eclipse.emf.ecp.ide.editor.view.templatebridge"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)"
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.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 a42c39c..4752fd7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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/tooling/editor/TemplateModelEditorPart.java b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/tooling/editor/TemplateModelEditorPart.java
index 6f7732c..06cb2cf 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/tooling/editor/TemplateModelEditorPart.java
+++ b/bundles/org.eclipse.emf.ecp.view.template.tooling/src/org/eclipse/emf/ecp/view/template/tooling/editor/TemplateModelEditorPart.java
@@ -112,6 +112,7 @@
*
* @param objectToReveal the object to reveal
*/
+ @Override
public void reveal(EObject objectToReveal) {
treeMasterDetail.getSelectionProvider().refresh();
treeMasterDetail.getSelectionProvider().reveal(objectToReveal);
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 98c77ce..240f8e3 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 359d533..f9d66e6 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a98128a..973af27 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.11.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.model;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit,org.eclipse.emf.ecp.view.treemasterdetail.ui.swt",
+ org.eclipse.emf.ecp.view.treemasterdetail.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.model.util;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.treemasterdetail.model.edit"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 ff64c07..2ef8c98 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ee12374..48c6a30 100644
--- a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.11.0",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.11.0";x-internal:=true,
- org.eclipse.emf.edit.ui.action.ecp;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.treemasterdetail.ui.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.treemasterdetail.ui.swt;version="1.12.0",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.internal;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.edit.ui.action.ecp;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/TreeMasterDetailSWTRendererService.xml
Bundle-ActivationPolicy: lazy
@@ -26,9 +26,9 @@
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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.swt.core;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core;version="[1.12.0,1.13.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml b/bundles/org.eclipse.emf.ecp.view.treemasterdetail.ui.swt/pom.xml
index 4627c65..5c3568f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 11fe567..3e6106f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.internal.validation;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)"
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.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.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 430ac70..3df11a3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 fa86351..6186978 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.unset;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.unset.test"
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 f3a5e14..bf79141 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 16efc36..3c02489 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,13 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Util RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.view.util.swt.rap
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt.rap;version="1.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.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"
+Import-Package: org.eclipse.emfforms.spi.swt.core.layout;version="1.12.0",
+ org.osgi.framework;version="1.3.0",
+ org.osgi.service.component.annotations;version="1.2.0"
Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.xml
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.xml b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.xml
new file mode 100644
index 0000000..fb2d059
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/OSGI-INF/org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect.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.util.swt.rap.EMFFormsSWTLayoutDirect">
+ <service>
+ <provide interface="org.eclipse.emfforms.spi.swt.core.layout.EMFFormsSWTLayoutOptimizer"/>
+ </service>
+ <implementation class="org.eclipse.emf.ecp.view.internal.util.swt.rap.EMFFormsSWTLayoutDirect"/>
+</scr:component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/build.properties b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/build.properties
index f250f99..6210e84 100644
--- a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/build.properties
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/build.properties
@@ -1,4 +1,5 @@
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ OSGI-INF/
source.. = src/
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 8ad917a..295385c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.view.util.swt.rap/src/org/eclipse/emf/ecp/view/internal/util/swt/rap/EMFFormsSWTLayoutDirect.java b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/src/org/eclipse/emf/ecp/view/internal/util/swt/rap/EMFFormsSWTLayoutDirect.java
new file mode 100644
index 0000000..5dbc538
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.view.util.swt.rap/src/org/eclipse/emf/ecp/view/internal/util/swt/rap/EMFFormsSWTLayoutDirect.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.ecp.view.internal.util.swt.rap;
+
+import org.eclipse.emfforms.spi.swt.core.layout.EMFFormsSWTLayoutOptimizer;
+import org.eclipse.swt.widgets.Composite;
+import org.osgi.service.component.annotations.Component;
+
+/**
+ * EMFFormsSWTLayoutDirect does not cache anything and triggers the layout directly.
+ *
+ * @author Eugen Neufeld
+ * @since 1.12
+ *
+ */
+@Component
+public class EMFFormsSWTLayoutDirect implements EMFFormsSWTLayoutOptimizer {
+ @Override
+ public synchronized void layout(Composite parent) {
+ if (parent.isDisposed()) {
+ return;
+ }
+ parent.layout(true, true);
+ }
+}
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 b100b9d..5420f29 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.util.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.util.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.util.swt;version="1.12.0"
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 4b7f492..b5bfd4f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7d81797..221a68a 100644
--- a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: Default Bean Validation
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean.default;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.validation.bean;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: javax.validation
+Import-Package: javax.validation;version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml b/bundles/org.eclipse.emf.ecp.view.validation.bean.default/pom.xml
index 47f9bfc..8837a46 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 dcddeeb..9442faa 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,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Forms BeanValidation
Bundle-SymbolicName: org.eclipse.emf.ecp.view.validation.bean;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.internal.validation.bean;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
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
-Import-Package: javax.validation,
- javax.validation.bootstrap,
- org.apache.commons.logging
+Import-Package: javax.validation;version="[1.0.0,2.0.0)",
+ javax.validation.bootstrap;version="[1.0.0,2.0.0)",
+ org.apache.commons.logging;version="[1.1.0,2.0.0)"
Bundle-ActivationPolicy: lazy
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 4a66e04..0102d04 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 08ec97f..abb768d 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";
+Export-Package: org.eclipse.emf.ecp.view.internal.validation;version="1.12.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.11.0"
+ org.eclipse.emf.ecp.view.spi.validation;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)"
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 0210023..962a2d8 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 dc0b6ca..7a14c9c 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
@@ -92,46 +92,17 @@
.getFeature()) {
if (VViewPackage.eINSTANCE.getControl().isInstance(notification.getNotifier())) {
final VControl control = (VControl) notification.getNotifier();
-
- if (VViewPackage.eINSTANCE.getElement_Enabled() == notification.getRawNotification().getFeature()) {
- control.setDiagnostic(null);
- }
-
final VDomainModelReference domainModelReference = control.getDomainModelReference();
if (domainModelReference == null) {
return;
}
- IObservableValue observableValue;
try {
- observableValue = Activator.getDefault().getEMFFormsDatabinding()
- .getObservableValue(domainModelReference, context.getDomainModel());
+ handleControlNotification(notification, control, domainModelReference);
} catch (final DatabindingFailedException ex) {
Activator.getDefault().getReportService().report(new DatabindingFailedReport(ex));
return;
}
- final EObject observed = (EObject) ((IObserving) observableValue).getObserved();
- // validate(observed);
- // TODO: add test case fo this
- final Set<EObject> eObjectsToValidate = new LinkedHashSet<EObject>();
- eObjectsToValidate.add(observed);
- final EStructuralFeature structuralFeature = (EStructuralFeature) observableValue.getValueType();
- 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>) value;
- eObjectsToValidate.addAll(list);
- } else {
- eObjectsToValidate.add((EObject) value);
- }
- }
- validate(eObjectsToValidate);
- observableValue.dispose();
+
}
}
if (!VElement.class.isInstance(notification.getNotifier())) {
@@ -148,6 +119,48 @@
}
}
+ /**
+ * @param notification
+ * @param control
+ * @param domainModelReference
+ * @throws DatabindingFailedException
+ */
+ private void handleControlNotification(ModelChangeNotification notification, VControl control,
+ VDomainModelReference domainModelReference) throws DatabindingFailedException {
+ if (VViewPackage.eINSTANCE.getElement_Enabled() == notification.getRawNotification().getFeature()) {
+ control.setDiagnostic(null);
+ }
+
+ IObservableValue observableValue;
+ observableValue = Activator.getDefault().getEMFFormsDatabinding()
+ .getObservableValue(domainModelReference, context.getDomainModel());
+
+ final EObject observed = (EObject) ((IObserving) observableValue).getObserved();
+ // validate(observed);
+ // TODO: add test case fo this
+ final Set<EObject> eObjectsToValidate = new LinkedHashSet<EObject>();
+ eObjectsToValidate.add(observed);
+ final EStructuralFeature structuralFeature = (EStructuralFeature) observableValue.getValueType();
+ 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>) value;
+ eObjectsToValidate.addAll(list);
+ } else {
+ eObjectsToValidate.add((EObject) value);
+ }
+ }
+ validate(eObjectsToValidate);
+ observableValue.dispose();
+
+ }
+
@Override
public void notifyAdd(Notifier notifier) {
if (VDomainModelReference.class.isInstance(notifier)
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 d9d3452..72b0e57 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 e1a1603..2d93f72 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d0d0148..2e80e83 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.spi.vertical.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.vertical.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 c5bb0f4..cf6b7ff 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a1878c2..fdf2383 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.vertical.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.vertical.swt;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.eclipse.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 7cbbdc8..b5c1575 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 76e014f..836bd69 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.model.provider;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.provider;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 26346e3..752609c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7582a4d..07b8ee9 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.11.0",
- org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.model.util;version="1.12.0",
+ org.eclipse.emf.ecp.view.spi.viewproxy.resolver;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml b/bundles/org.eclipse.emf.ecp.view.viewproxy.model/pom.xml
index c87d2be..9d156da 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 113532c..d3dd4ab 100644
--- a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewModel Workspace Migrator
Bundle-SymbolicName: org.eclipse.emf.ecp.view.workspace.migrator;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.workspace.migrator;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.migrator;bundle-version="[1.12.0,1.13.0)",
org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml b/bundles/org.eclipse.emf.ecp.view.workspace.migrator/pom.xml
index f6e11a8..884c7a0 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8de9c70..50f616e 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.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.12.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.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 cdb83d1..e8d75bf 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 f700e61..8747eaa 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.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 aaf30f0..868d0d1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8d413aa..f36c920 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.11.0.qualifier
+Bundle-Version: 1.12.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 a620940..193e4f2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 61aee85..35462b0 100644
--- a/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.common/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Common
Bundle-SymbolicName: org.eclipse.emfforms.common
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.common;version="1.11.0",
- org.eclipse.emfforms.internal.common.converter;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.common.report;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.common.converter;version="1.11.0",
- org.eclipse.emfforms.spi.common.locale;version="1.11.0",
- org.eclipse.emfforms.spi.common.report;version="1.11.0"
+Export-Package: org.eclipse.emfforms.common;version="1.12.0",
+ org.eclipse.emfforms.internal.common.converter;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.common.report;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common.converter;version="1.12.0",
+ org.eclipse.emfforms.spi.common.locale;version="1.12.0",
+ org.eclipse.emfforms.spi.common.report;version="1.12.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.common/pom.xml b/bundles/org.eclipse.emfforms.common/pom.xml
index 702a50c..5ab7737 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1f88714..d411888 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)"
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 bbae037..7bc5af5 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 baaef58..3792c6a 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.index/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Index DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.index
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.index;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
Service-Component: OSGI-INF/indexDomainModelReferenceConverter.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.index/pom.xml
index 426f004..18efe62 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.databinding.keyattribute/META-INF/MANIFEST.MF
index 4aba48f..15500b1 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.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 188ea5a..8f0afa1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 f4e52aa..cae8d46 100644
--- a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Mapping DMR Converter
Bundle-SymbolicName: org.eclipse.emfforms.core.services.databinding.mapping
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.1.0,2.0.0)"
Service-Component: OSGI-INF/mappingDomainModelReferenceConverter.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml b/bundles/org.eclipse.emfforms.core.services.databinding.mapping/pom.xml
index e1de0c0..a28c68c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.default/META-INF/MANIFEST.MF
index 43f6f72..647b344 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
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 95b071f..07fcba9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 563b88c..9ae912e 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.index/pom.xml
index edac224..6721045 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/META-INF/MANIFEST.MF
index ecb9db3..7c5312f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.keyattribute/pom.xml
index d341a2d..a073c3d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.mapping/META-INF/MANIFEST.MF
index 42461df..d0826ad 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
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 fc48c7c..06ef59d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/META-INF/MANIFEST.MF
index 39b31f5..066ece8 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.domainexpander.table;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml b/bundles/org.eclipse.emfforms.core.services.domainexpander.table/pom.xml
index d67d104..d56f37c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.editsupport/META-INF/MANIFEST.MF
index d55966e..aac4761 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.editsupport;version="1.11.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.editsupport;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.editsupport;version="1.12.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.localization;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.0)"
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 2bc11d2..b572a04 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.emf/META-INF/MANIFEST.MF
index 065de75..2aa9b4a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.core.services.databinding;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.label;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.localization;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.label;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.0)",
org.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 8657aa0..96d6686 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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/EMFFormsLabelProviderImpl.java b/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/EMFFormsLabelProviderImpl.java
index dbb4128..3b45a3b 100644
--- a/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/EMFFormsLabelProviderImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services.emf/src/org/eclipse/emfforms/internal/core/services/label/EMFFormsLabelProviderImpl.java
@@ -376,13 +376,19 @@
@Override
public void notifyLocaleChange() {
for (final Entry<WritableValue, BundleKeyWrapper> entry : displayKeyObservableMap.entrySet()) {
- final BundleKeyWrapper displayNameKey = entry.getValue();
final WritableValue writableValue = entry.getKey();
+ if (writableValue.isDisposed()) {
+ continue;
+ }
+ final BundleKeyWrapper displayNameKey = entry.getValue();
writableValue.setValue(getDisplayName(displayNameKey.getBundle(), displayNameKey.getKey()));
}
for (final Entry<WritableValue, DescriptionKey> entry : descriptionKeyObservableMap.entrySet()) {
- final DescriptionKey descriptionKey = entry.getValue();
final WritableValue writableValue = entry.getKey();
+ if (writableValue.isDisposed()) {
+ continue;
+ }
+ final DescriptionKey descriptionKey = entry.getValue();
writableValue.setValue(getDescription(descriptionKey.geteClassName(), descriptionKey.getFeatureName(),
descriptionKey.getBundle()));
}
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 9ca602f..1802739 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.11.0"
+Export-Package: org.eclipse.emfforms.internal.core.services.emfspecificservice;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.emfspecificservice;version="1.12.0"
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 0bdf032..9c39faf 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.legacy/META-INF/MANIFEST.MF
index dd547c1..bb311ed 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.legacy;version="1.12.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.spi.model;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.context;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
org.osgi.service.component.annotations;version="[1.1.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.core.services.legacy.EMFFormsLegacyServicesManagerImpl.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml b/bundles/org.eclipse.emfforms.core.services.legacy/pom.xml
index 35055b3..a4c8d99 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.locale.default/META-INF/MANIFEST.MF
index 3bc7461..6965a1b 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.11.0"
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.locale.defaultlocale;version="1.12.0"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.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 8be9d98..53c5698 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.default/META-INF/MANIFEST.MF
index b26d046..7de2991 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.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 a49e45b..dc90d84 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.mappingprovider.table/META-INF/MANIFEST.MF
index 0a83544..32d07f4 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emf.ecp.view.spi.provider;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
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 afa398b..9a338c6 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.default/META-INF/MANIFEST.MF
index 90b0fa4..a57d5aa 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
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 e5a09b7..db92acc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.index/META-INF/MANIFEST.MF
index e4cb3ed..5f6d52b 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.index;version="1.12.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.12.0,1.13.0)",
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 56c321e..88b19d5 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
index 743d8bb..aeb9c4c 100644
--- a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: KeyAttribute Structural Change Tester
Bundle-SymbolicName: org.eclipse.emfforms.core.services.structuralchange.keyattribute
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.databinding.emf;version="[1.12.0,1.13.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/StructuralChangeTesterKeyAttribute.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange.keyattribute/pom.xml
index b14b35f..5b04c4b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.mapping/META-INF/MANIFEST.MF
index 2fcefa6..0e9056f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.core.services.structuralchange.mapping;version="1.12.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emf.ecp.common.spi.asserts;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="[1.12.0,1.13.0)",
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 5baf88d..1e283c9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange.table/META-INF/MANIFEST.MF
index 419107f..ae58772 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
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 edbde2a..b8c1164 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services.structuralchange/META-INF/MANIFEST.MF
index 0ed1171..464ce52 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.service.component.annotations;version="0.0.0"
Service-Component: OSGI-INF/EMFFormsStructuralChangeTesterImpl.xml
diff --git a/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml b/bundles/org.eclipse.emfforms.core.services.structuralchange/pom.xml
index 30e433b..65c12bd 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.core.services/META-INF/MANIFEST.MF
index d1d3001..18ac1e5 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.scoped;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.core.services.controlmapper;version="1.11.0",
- org.eclipse.emfforms.spi.core.services.databinding;version="1.11.0",
- org.eclipse.emfforms.spi.core.services.domainexpander;version="1.11.0",
- org.eclipse.emfforms.spi.core.services.label;version="1.11.0",
- org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.11.0",
- org.eclipse.emfforms.spi.core.services.structuralchange;version="1.11.0",
- org.eclipse.emfforms.spi.core.services.view;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+Export-Package: org.eclipse.emfforms.internal.core.services.controlmapper;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.mappingprovider;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.scoped;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.core.services.controlmapper;version="1.12.0",
+ org.eclipse.emfforms.spi.core.services.databinding;version="1.12.0",
+ org.eclipse.emfforms.spi.core.services.domainexpander;version="1.12.0",
+ org.eclipse.emfforms.spi.core.services.label;version="1.12.0",
+ org.eclipse.emfforms.spi.core.services.mappingprovider;version="1.12.0",
+ org.eclipse.emfforms.spi.core.services.structuralchange;version="1.12.0",
+ org.eclipse.emfforms.spi.core.services.view;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.spi.model;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.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 e4300c2..26672d7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
index 50768ad..6835f84 100644
--- a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
+++ b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/internal/core/services/controlmapper/SettingToControlMapperImpl.java
@@ -137,7 +137,8 @@
final Set<VControl> currentControls = settingToControlMap.get(setting);
if (currentControls != null) {
for (final VElement control : currentControls) {
- if (!control.isEnabled() || !control.isVisible() || control.isReadonly()) {
+ if (!control.isEffectivelyEnabled() || !control.isEffectivelyVisible()
+ || control.isEffectivelyReadonly()) {
continue;
}
elements.add(control);
diff --git a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/spi/core/services/databinding/EMFFormsDatabinding.java b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/spi/core/services/databinding/EMFFormsDatabinding.java
index efe2697..b422357 100644
--- a/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/spi/core/services/databinding/EMFFormsDatabinding.java
+++ b/bundles/org.eclipse.emfforms.core.services/src/org/eclipse/emfforms/spi/core/services/databinding/EMFFormsDatabinding.java
@@ -33,7 +33,9 @@
* of the given {@link EObject}.
*
* @param domainModelReference The domain model reference pointing to the desired value
- * @param object The object containing the value of the reference
+ * @param object The root object of the rendered form. If the {@link VDomainModelReference} contains a path, the
+ * object is the first node of the path. Therefore, the {@link IObservableValue} can be bound to a
+ * feature of a sub element in case of a path.
* @return The resulting {@link IObservableValue}, does not return <code>null</code>.
* @throws DatabindingFailedException if the databinding could not be executed successfully.
*/
@@ -45,7 +47,9 @@
* the given {@link EObject}.
*
* @param domainModelReference The domain model reference pointing to the desired list
- * @param object The object containing the values of the reference
+ * @param object The root object of the rendered form. If the {@link VDomainModelReference} contains a path, the
+ * object is the first node of the path. Therefore, the {@link IObservableValue} can be bound to a
+ * feature of a sub element in case of a path.
* @return The resulting {@link IObservableList}, does not return <code>null</code>
* @throws DatabindingFailedException if the databinding could not be executed successfully.
*/
@@ -56,7 +60,9 @@
* Returns an {@link IValueProperty} described by the given {@link VDomainModelReference}.
*
* @param domainModelReference The domain model reference pointing to the desired value
- * @param object The root object of the rendered form
+ * @param object The root object of the rendered form. If the {@link VDomainModelReference} contains a path, the
+ * object is the first node of the path. Therefore, the {@link IValueProperty} can be bound to a feature
+ * of a sub element in case of a path.
* @return The resulting {@link IValueProperty}, does not return <code>null</code>.
* @throws DatabindingFailedException if the databinding could not be executed successfully.
*/
@@ -67,7 +73,9 @@
* Returns an {@link IListProperty} described by the given {@link VDomainModelReference}.
*
* @param domainModelReference The domain model reference pointing to the desired list
- * @param object The root object of the rendered form
+ * @param object The root object of the rendered form. If the {@link VDomainModelReference} contains a path, the
+ * object is the first node of the path. Therefore, the {@link IValueProperty} can be bound to a feature
+ * of a sub element in case of a path.
* @return The resulting {@link IListProperty}, does not return <code>null</code>.
* @throws DatabindingFailedException if the databinding could not be executed successfully.
*/
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 3d0b81c..a1b5184 100644
--- a/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.ecore/META-INF/MANIFEST.MF
@@ -2,44 +2,44 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ecore Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.ecore;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.actions;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.controls;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.editor.ecore;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.actions;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.helpers;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ecore.referenceservices;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,1.4.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.editor.ecore;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.editor.ecore;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common.ui;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common.ui;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.11.0,1.12.0)";resolution:=optional,
+ org.eclipse.emfforms.internal.editor.ecore.controls;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)";resolution:=optional,
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/InstanceTypeNameSWTRendererService.xml,OSGI-INF/dataTypeControlService.xml,OSGI-INF/eenumLiteralControlService.xml,OSGI-INF/org.eclipse.emfforms.internal.editor.ecore.controls.LinkOnlyMultiReferenceRendererService.xml,OSGI-INF/typedElementBoundsControlService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor.ecore/pom.xml b/bundles/org.eclipse.emfforms.editor.ecore/pom.xml
index 3358f18..b1b4249 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
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 4a53ef7..dc333e0 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
@@ -201,11 +201,7 @@
return;
}
- if (!eReference.isMany()) {
- context.getDomainModel().eSet(eReference, eObject);
- } else {
- ECPControlHelper.addModelElementInReference(context.getDomainModel(), eObject, eReference, editingDomain);
- }
+ ECPControlHelper.addModelElementInReference(context.getDomainModel(), eObject, eReference, editingDomain);
}
@Override
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
index d5c097f..820bf72 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Genmodel Editor Utilities
Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel.util;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.editor.genmodel.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util.handler;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.ui.workbench;bundle-version="[3.7.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
index 7788a45..a5f04fb 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
+++ b/bundles/org.eclipse.emfforms.editor.genmodel.util/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
index b8cee96..744f522 100644
--- a/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.genmodel/META-INF/MANIFEST.MF
@@ -2,22 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: GenModel Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.genmodel;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
- org.eclipse.emfforms.internal.editor.genmodel.service;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.genmodel.util;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.editor.genmodel;version="1.12.0";x-internal:=true;uses:="org.eclipse.emfforms.spi.editor",
+ org.eclipse.emfforms.internal.editor.genmodel.service;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.toolbaractions;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.genmodel.util;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.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 1dde55d..086703a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
index b431ea2..56f9422 100644
--- a/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor.viewmodel/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: ViewModel Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor.viewmodel;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.model.preview.e3"
+Export-Package: org.eclipse.emfforms.internal.editor.viewmodel;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model.preview.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.editor.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
org.eclipse.ui.ide;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml b/bundles/org.eclipse.emfforms.editor.viewmodel/pom.xml
index 0473220..aed0aab 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
index 97938a3..5c547d6 100644
--- a/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.editor/META-INF/MANIFEST.MF
@@ -2,33 +2,33 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMF Editor based on EMFForms
Bundle-SymbolicName: org.eclipse.emfforms.editor;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Activator: org.eclipse.emfforms.internal.editor.Activator
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.editor;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.editor.handlers;version="1.11.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.editor.toolbaractions;version="1.11.0";;x-internal:=true;x-internal:=true,
- org.eclipse.emfforms.internal.editor.ui;version="1.11.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.spi.editor;version="1.11.0",
- org.eclipse.emfforms.spi.editor.handler;version="1.11.0",
- org.eclipse.emfforms.spi.editor.helpers;version="1.11.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel"
+Export-Package: org.eclipse.emfforms.internal.editor;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.editor.handlers;version="1.12.0";;x-internal:=true;x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.editor.toolbaractions;version="1.12.0";;x-internal:=true;x-internal:=true,
+ org.eclipse.emfforms.internal.editor.ui;version="1.12.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.spi.editor;version="1.12.0",
+ org.eclipse.emfforms.spi.editor.handler;version="1.12.0",
+ org.eclipse.emfforms.spi.editor.helpers;version="1.12.0";;x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor.genmodel"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.editor/pom.xml b/bundles/org.eclipse.emfforms.editor/pom.xml
index 6ebe5ca..6181c61 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.localization/META-INF/MANIFEST.MF
index 94bda33..50a9f85 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.localization;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.11.0"
+Export-Package: org.eclipse.emfforms.internal.localization;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.12.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/localizationService.xml
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.11.0,1.12.0]",
+ org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0]",
org.eclipse.osgi.service.localization;version="[1.1.0,2.0.0)",
org.osgi.framework;version="[1.3.0,2.0.0)",
org.osgi.service.component.annotations;version="1.2.0",
diff --git a/bundles/org.eclipse.emfforms.localization/pom.xml b/bundles/org.eclipse.emfforms.localization/pom.xml
index d826798..6048db5 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
index c8cdb93..685fa65 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/META-INF/MANIFEST.MF
@@ -2,20 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model.edit;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emfforms.spi.rulerepository.model.provider.RulerepositoryEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.rule.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.properties b/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.properties
index f0f6e4f..cd4d5d5 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.properties
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/plugin.properties
@@ -38,3 +38,4 @@
_UI_RuleEntry_mergeType_feature = Merge Type
_UI_MergeType_And_literal = And
_UI_MergeType_Or_literal = Or
+_UI_RuleEntry_name_feature = Name
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
index 159606d..e712138 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.model.edit/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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
index 48d6da0..e90bf3e 100644
--- 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
@@ -30,7 +30,6 @@
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.emfforms.spi.rulerepository.model.MergeType;
import org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry;
import org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage;
@@ -64,6 +63,7 @@
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addNamePropertyDescriptor(object);
addRulePropertyDescriptor(object);
addElementsPropertyDescriptor(object);
addMergeTypePropertyDescriptor(object);
@@ -72,6 +72,28 @@
}
/**
+ * This adds a property descriptor for the Name feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addNamePropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_RuleEntry_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_RuleEntry_name_feature", "_UI_RuleEntry_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VRulerepositoryPackage.Literals.RULE_ENTRY__NAME,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Rule feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -189,8 +211,7 @@
*/
@Override
public String getText(Object object) {
- final MergeType labelValue = ((VRuleEntry) object).getMergeType();
- final String label = labelValue == null ? null : labelValue.toString();
+ final String label = ((VRuleEntry) object).getName();
return label == null || label.length() == 0 ? getString("_UI_RuleEntry_type") : //$NON-NLS-1$
getString("_UI_RuleEntry_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -208,6 +229,7 @@
updateChildren(notification);
switch (notification.getFeatureID(VRuleEntry.class)) {
+ case VRulerepositoryPackage.RULE_ENTRY__NAME:
case VRulerepositoryPackage.RULE_ENTRY__MERGE_TYPE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
index cb5ae2e..15a1a05 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/META-INF/MANIFEST.MF
@@ -2,19 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.model;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.11.0",
- org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.11.0";
- x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
- org.eclipse.emfforms.spi.rulerepository.model.util;version="1.11.0";
- x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
+Export-Package: org.eclipse.emfforms.spi.rulerepository.model;version="1.12.0",
+ org.eclipse.emfforms.spi.rulerepository.model.impl;version="1.12.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit",
+ org.eclipse.emfforms.spi.rulerepository.model.util;version="1.12.0";x-friends:="org.eclipse.emfforms.rulerepository.model.edit"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.ecore b/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.ecore
index 24a996d..88b59d2 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.ecore
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/model/rulerepository.ecore
@@ -7,6 +7,7 @@
eType="#//RuleEntry" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RuleEntry">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<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"
diff --git a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
index c051735..afc46b5 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.model/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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
index 6f10427..7ca6ef6 100644
--- 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
@@ -24,6 +24,7 @@
* The following features are supported:
* </p>
* <ul>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getName <em>Name</em>}</li>
* <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>
* <li>{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getMergeType <em>Merge Type</em>}</li>
@@ -35,6 +36,35 @@
*/
public interface VRuleEntry extends EObject {
/**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRulerepositoryPackage#getRuleEntry_Name()
+ * @model
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getName <em>Name</em>}'
+ * attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+ /**
* Returns the value of the '<em><b>Rule</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
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
index eb012ef..9e004d0 100644
--- 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
@@ -110,13 +110,23 @@
int RULE_ENTRY = 1;
/**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RULE_ENTRY__NAME = 0;
+
+ /**
* 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;
+ int RULE_ENTRY__RULE = 1;
/**
* The feature id for the '<em><b>Elements</b></em>' reference list. <!--
@@ -125,7 +135,7 @@
* @generated
* @ordered
*/
- int RULE_ENTRY__ELEMENTS = 1;
+ int RULE_ENTRY__ELEMENTS = 2;
/**
* The feature id for the '<em><b>Merge Type</b></em>' attribute.
@@ -135,7 +145,7 @@
* @generated
* @ordered
*/
- int RULE_ENTRY__MERGE_TYPE = 2;
+ int RULE_ENTRY__MERGE_TYPE = 3;
/**
* The number of structural features of the '<em>Rule Entry</em>' class.
@@ -144,7 +154,7 @@
* @generated
* @ordered
*/
- int RULE_ENTRY_FEATURE_COUNT = 3;
+ int RULE_ENTRY_FEATURE_COUNT = 4;
/**
* The meta object id for the '{@link org.eclipse.emfforms.spi.rulerepository.model.MergeType <em>Merge Type</em>}'
@@ -193,6 +203,19 @@
EClass getRuleEntry();
/**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.eclipse.emfforms.spi.rulerepository.model.VRuleEntry#getName()
+ * @see #getRuleEntry()
+ * @generated
+ */
+ EAttribute getRuleEntry_Name();
+
+ /**
* 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 -->
@@ -299,6 +322,15 @@
EClass RULE_ENTRY = eINSTANCE.getRuleEntry();
/**
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute RULE_ENTRY__NAME = eINSTANCE.getRuleEntry_Name();
+
+ /**
* The meta object literal for the '<em><b>Rule</b></em>' containment reference feature.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
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
index 5937052..f64410a 100644
--- 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
@@ -34,6 +34,7 @@
* The following features are implemented:
* </p>
* <ul>
+ * <li>{@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl#getName <em>Name</em>}</li>
* <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>
* <li>{@link org.eclipse.emfforms.spi.rulerepository.model.impl.VRuleEntryImpl#getMergeType <em>Merge Type</em>}</li>
@@ -43,6 +44,28 @@
*/
public class VRuleEntryImpl extends EObjectImpl implements VRuleEntry {
/**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
* The cached value of the '{@link #getRule() <em>Rule</em>}' containment reference.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -104,6 +127,33 @@
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setName(String newName) {
+ final String oldName = name;
+ name = newName;
+ if (eNotificationRequired()) {
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, VRulerepositoryPackage.RULE_ENTRY__NAME, oldName, name));
+ }
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
@@ -223,6 +273,8 @@
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__NAME:
+ return getName();
case VRulerepositoryPackage.RULE_ENTRY__RULE:
return getRule();
case VRulerepositoryPackage.RULE_ENTRY__ELEMENTS:
@@ -242,6 +294,9 @@
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__NAME:
+ setName((String) newValue);
+ return;
case VRulerepositoryPackage.RULE_ENTRY__RULE:
setRule((Rule) newValue);
return;
@@ -264,6 +319,9 @@
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__NAME:
+ setName(NAME_EDEFAULT);
+ return;
case VRulerepositoryPackage.RULE_ENTRY__RULE:
setRule((Rule) null);
return;
@@ -285,6 +343,8 @@
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case VRulerepositoryPackage.RULE_ENTRY__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
case VRulerepositoryPackage.RULE_ENTRY__RULE:
return rule != null;
case VRulerepositoryPackage.RULE_ENTRY__ELEMENTS:
@@ -308,7 +368,9 @@
}
final StringBuffer result = new StringBuffer(super.toString());
- result.append(" (mergeType: "); //$NON-NLS-1$
+ result.append(" (name: "); //$NON-NLS-1$
+ result.append(name);
+ result.append(", mergeType: "); //$NON-NLS-1$
result.append(mergeType);
result.append(')');
return result.toString();
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
index 69cd54a..77e47cd 100644
--- 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
@@ -154,13 +154,24 @@
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getRuleEntry_Name() {
+ return (EAttribute) ruleEntryEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
*/
@Override
public EReference getRuleEntry_Rule() {
- return (EReference) ruleEntryEClass.getEStructuralFeatures().get(0);
+ return (EReference) ruleEntryEClass.getEStructuralFeatures().get(1);
}
/**
@@ -170,7 +181,7 @@
*/
@Override
public EReference getRuleEntry_Elements() {
- return (EReference) ruleEntryEClass.getEStructuralFeatures().get(1);
+ return (EReference) ruleEntryEClass.getEStructuralFeatures().get(2);
}
/**
@@ -181,7 +192,7 @@
*/
@Override
public EAttribute getRuleEntry_MergeType() {
- return (EAttribute) ruleEntryEClass.getEStructuralFeatures().get(2);
+ return (EAttribute) ruleEntryEClass.getEStructuralFeatures().get(3);
}
/**
@@ -231,6 +242,7 @@
createEReference(ruleRepositoryEClass, RULE_REPOSITORY__RULE_ENTRIES);
ruleEntryEClass = createEClass(RULE_ENTRY);
+ createEAttribute(ruleEntryEClass, RULE_ENTRY__NAME);
createEReference(ruleEntryEClass, RULE_ENTRY__RULE);
createEReference(ruleEntryEClass, RULE_ENTRY__ELEMENTS);
createEAttribute(ruleEntryEClass, RULE_ENTRY__MERGE_TYPE);
@@ -283,6 +295,8 @@
initEClass(ruleEntryEClass, VRuleEntry.class, "RuleEntry", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getRuleEntry_Name(), ecorePackage.getEString(), "name", null, 0, 1, VRuleEntry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
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);
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
index 19c4a6f..87962ed 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms RuleRepository Tooling
Bundle-SymbolicName: org.eclipse.emfforms.rulerepository.tooling;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.rulerepository.tooling;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.merge;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.rulerepository.tooling.wizard;version="1.12.0";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.9.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.106.0,4.0.0)",
@@ -14,19 +14,19 @@
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.editor;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ide.util;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.rulerepository.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.editor;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)",
org.osgi.service.component.annotations;version="[1.2.0,2.0.0)";resolution:=optional
Service-Component: OSGI-INF/org.eclipse.emfforms.internal.rulerepository.tooling.RuleRepositoryLinkFeatureControlRendererService.xml
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/plugin.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/plugin.xml
index 49e9032..e5677f5 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/plugin.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/plugin.xml
@@ -16,7 +16,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu">
+ locationURI="popup:org.eclipse.ui.popup.any">
<menu
id="org.eclipse.emf.ecp.ui.e3.emfFormsMenu"
label="EMF Forms">
diff --git a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
index c799d6d..b0f5ea0 100644
--- a/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
+++ b/bundles/org.eclipse.emfforms.rulerepository.tooling/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.setup.base/META-INF/MANIFEST.MF
index 5d75a79..d0c1d50 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.table;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.service;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emfspecificservice;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.locale.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.mapping;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.table;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.plugin;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.table;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.service;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.control.multiattribute;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.12.0,1.13.0)"
diff --git a/bundles/org.eclipse.emfforms.setup.base/pom.xml b/bundles/org.eclipse.emfforms.setup.base/pom.xml
index ca605ab..3b8e546 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0fff910..532ceaf 100644
--- a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms Categorization renderer using an Expandbar
Bundle-SymbolicName: org.eclipse.emfforms.swt.categorization.expandbar
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.categorization.expandbar;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
org.eclipse.rap.rwt;bundle-version="[3.0.2,4.0.0)",
org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)",
@@ -16,13 +16,13 @@
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: javax.inject;version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.internal.swt.util;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.spi.swt.util;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.spi.swt.reporting;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.style.validation.model;version="[1.12.0,1.13.0)",
org.eclipse.emf.edit.ui.provider;version="0.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.0)",
org.eclipse.jface.databinding.swt;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.jface.resource;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml b/bundles/org.eclipse.emfforms.swt.categorization.expandbar/pom.xml
index e6f3eff..43e57b0 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.multiattribute/META-INF/MANIFEST.MF
index 9652c4f..9acaced 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.view.control.multiattribute;version="1.11.0",
- org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.view.control.multiattribute;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.view.control.multiattribute.celleditor;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.view.control.multiattribute;version="1.12.0",
+ org.eclipse.emfforms.spi.view.control.multiattribute.celleditor;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
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 962f299..f745c76 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
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 59ef2f4..4747491 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.autocomplete.viewservice;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
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 bdaa845..514fc2b 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
index 093a347..7bdc3f7 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Rich Text Control
Bundle-SymbolicName: org.eclipse.emfforms.swt.control.text.richtext;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.richtext.renderer;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
org.eclipse.jface.databinding.swt;version="0.0.0",
@@ -25,6 +25,7 @@
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.custom;version="0.0.0",
org.eclipse.swt.events;version="0.0.0",
org.eclipse.swt.graphics;version="0.0.0",
org.eclipse.swt.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
index b11cec5..b8c5712 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-bundles-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
index aaca3db..eecb033 100644
--- a/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.control.text.richtext/src/org/eclipse/emfforms/spi/swt/control/text/richtext/renderer/RichTextControlSWTRenderer.java
@@ -7,7 +7,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
- * Johannes Faltermeier - initial API and implementation
+ * Jonas Helming - initial API and implementation
******************************************************************************/
package org.eclipse.emfforms.spi.swt.control.text.richtext.renderer;
@@ -31,6 +31,7 @@
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.FocusEvent;
@@ -39,30 +40,34 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.events.VerifyListener;
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.
+ * The multi line text control renderer displays the text in a read only fashion. Once the control gains focus a
+ * popupcontrol is displayed allowing the user to edit the contents.
*
- * @author jfaltermeier
+ * @author Jonas Helming
*
*/
public class RichTextControlSWTRenderer extends TextControlSWTRenderer {
private GridData textGridData;
- private Text text;
+ private StyledText text;
/**
- * @author jonas
+ * @author Jonas Helming
*
*/
private final class OpenPopupHandler implements MouseListener {
- private final Text text;
+ private static final String RETURN_PATTERN = "[\n]"; //$NON-NLS-1$
+ private static final String CARRIAGE_PATTERN = "[\r]"; //$NON-NLS-1$
+ private final StyledText text;
- private OpenPopupHandler(Text text) {
+ private OpenPopupHandler(StyledText text) {
this.text = text;
}
@@ -84,8 +89,17 @@
innerText.setSize(300, getPreferrredPopupHeight());
popupWindow.getContent().pack();
innerText.setText(text.getText());
- innerText.setSelection(text.getCaretPosition());
+ innerText.setSelection(text.getCaretOffset());
+ innerText.addVerifyListener(new VerifyListener() {
+
+ @Override
+ public void verifyText(VerifyEvent e) {
+ if (e.text != null) {
+ e.text = e.text.replaceAll(CARRIAGE_PATTERN, "").replaceAll(RETURN_PATTERN, Text.DELIMITER); //$NON-NLS-1$
+ }
+ }
+ });
innerText.addFocusListener(new FocusListener() {
@Override
public void focusLost(FocusEvent e) {
@@ -178,15 +192,15 @@
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 = new StyledText(composite, getTextWidgetStyle());
text.setData(CUSTOM_VARIANT, getTextVariantID());
text.setEditable(false);
- text.setMessage(getTextMessage());
+ text.setToolTipText(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
+ gdf.hint(0, getTextHeightHint());// set x hint to enable wrapping
}
textGridData = gdf.create();
text.setLayoutData(textGridData);
@@ -198,8 +212,8 @@
textGridData.heightHint = getTextHeightHint();
text.setLayoutData(textGridData);
EMFFormsSWTLayoutUtil.adjustParentSize(text);
-
}
+
});
return composite;
}
@@ -227,6 +241,7 @@
}
final int lineCount = text.getLineCount();
int height = lineCount * text.getLineHeight();
+
final int maxHeight = getMaxTextHeight();
final int minHeight = getMinTextHeight();
if (height > maxHeight) {
@@ -246,6 +261,7 @@
if (text == null || text.isDisposed()) {
return -1;
}
+
return getMaxVisibleLines() * text.getLineHeight();
}
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 f8e9629..c1a4862 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.11.0"
-Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.controlgrid.renderer;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.12.0"
+Require-Bundle: org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.swt.core.di;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.swt.core.di;version="[1.12.0,1.13.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 1f6dbe1..81f2d02 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4dedd56..c7c424c 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.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 9a7cd96..d8f078f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 052d6fa..30eaa73 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core.di;version="1.11.0"
-Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core.di;version="1.12.0"
+Require-Bundle: org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.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 9234941..4febb5f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core.plugin/META-INF/MANIFEST.MF
index 5de1e84..5272b3e 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.internal.swt.core.plugin;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 75ce221..7c610bc 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
diff --git a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
index c7855f9..25795a7 100644
--- a/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.core/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFForms SWT Core
Bundle-SymbolicName: org.eclipse.emfforms.swt.core
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.core;version="1.11.0",
- org.eclipse.emfforms.spi.swt.core.data;version="1.11.0",
- org.eclipse.emfforms.spi.swt.core.layout;version="1.11.0",
- org.eclipse.emfforms.spi.swt.core.util;version="1.11.0",
- org.eclipse.emfforms.swt.core;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.core;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.core.data;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.core.layout;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.core.util;version="1.12.0",
+ org.eclipse.emfforms.swt.core;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emf.ecp.view.model.common;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.custom;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.core/pom.xml b/bundles/org.eclipse.emfforms.swt.core/pom.xml
index 3293768..f81c670 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.11.0-SNAPSHOT</version>
+ <version>1.12.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/AbstractSWTRenderer.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/AbstractSWTRenderer.java
index 86c0e5e..fb562a2 100644
--- a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/AbstractSWTRenderer.java
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/AbstractSWTRenderer.java
@@ -258,7 +258,7 @@
* @throws NoPropertyDescriptorFoundExeption this is thrown when no property descriptor can be found
* @since 1.3
*/
- protected abstract Control renderControl(final SWTGridCell cell, Composite parent) throws NoRendererFoundException,
+ protected abstract Control renderControl(SWTGridCell cell, Composite parent) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption;
/**
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutDelayed.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutDelayed.java
new file mode 100644
index 0000000..21721c1
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutDelayed.java
@@ -0,0 +1,98 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.core.layout;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * This Layout Optimizer caches the incoming layout request for 200ms before triggering the layout.
+ *
+ * @author Eugen Neufeld
+ * @since 1.12
+ *
+ */
+public class EMFFormsSWTLayoutDelayed implements EMFFormsSWTLayoutOptimizer {
+
+ private Set<Composite> requestedLayouts = new LinkedHashSet<Composite>();
+ private Thread thread;
+
+ /**
+ * <p>
+ * This method will collect layoutrequest that happen in the same 200ms. When there are multiple layoutrequest for
+ * the same composite in this time frame, the composite will only be layouted once.
+ * </p>
+ * <p>
+ * This will help to improve performance as layout request are usually expensive. Also it might be quite common that
+ * e.g. multiple hide rules are triggered by the same condition.
+ * </p>
+ *
+ * @param parent the composite to layout
+ */
+ @Override
+ public synchronized void layout(Composite parent) {
+ getRequestedLayouts().add(parent);
+ layoutDelayed();
+ }
+
+ private synchronized void layoutDelayed() {
+ if (thread != null || getRequestedLayouts().isEmpty()) {
+ return;
+ }
+ final Display defaultDisplay = Display.getDefault();
+ thread = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(200);
+ } catch (final InterruptedException ex) {
+ /* silent */
+ }
+ final Set<Composite> toLayout = exchangeRequestedLayouts();
+
+ defaultDisplay.asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ for (final Composite composite : toLayout) {
+ if (composite.isDisposed()) {
+ continue;
+ }
+ composite.layout(true, true);
+ }
+ thread = null;
+ layoutDelayed();
+ }
+ });
+
+ }
+ });
+ thread.start();
+ }
+
+ private synchronized Set<Composite> getRequestedLayouts() {
+ return requestedLayouts;
+ }
+
+ private synchronized void setRequestedLayouts(Set<Composite> requestedLayouts) {
+ this.requestedLayouts = requestedLayouts;
+ }
+
+ private synchronized Set<Composite> exchangeRequestedLayouts() {
+ final Set<Composite> toLayout = new LinkedHashSet<Composite>(getRequestedLayouts());
+ setRequestedLayouts(new LinkedHashSet<Composite>());
+ return toLayout;
+ }
+}
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutOptimizer.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutOptimizer.java
new file mode 100644
index 0000000..3ace146
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutOptimizer.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2017 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emfforms.spi.swt.core.layout;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * EMFFormsSWTLayoutOptimizer allows to optimize the layout process. This is used by the EMFFormsSWTLayoutUtil.
+ *
+ * @author Eugen Neufeld
+ * @since 1.12
+ *
+ */
+public interface EMFFormsSWTLayoutOptimizer {
+
+ /**
+ * Layout the provided parent composite.
+ *
+ * @param parent The Composite to layout
+ */
+ void layout(Composite parent);
+}
diff --git a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutUtil.java b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutUtil.java
index 97d82fc..ee27941 100644
--- a/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutUtil.java
+++ b/bundles/org.eclipse.emfforms.swt.core/src/org/eclipse/emfforms/spi/swt/core/layout/EMFFormsSWTLayoutUtil.java
@@ -11,10 +11,6 @@
******************************************************************************/
package org.eclipse.emfforms.spi.swt.core.layout;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
import org.eclipse.swt.graphics.Point;
@@ -24,6 +20,10 @@
import org.eclipse.swt.widgets.ExpandBar;
import org.eclipse.swt.widgets.ExpandItem;
import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
/**
* Util class for common SWT-related layout tasks.
@@ -34,11 +34,26 @@
*/
public final class EMFFormsSWTLayoutUtil {
+ private static EMFFormsSWTLayoutOptimizer layoutOptimizer;
+
private EMFFormsSWTLayoutUtil() {
+
}
- private static Set<Composite> requestedLayouts = Collections.synchronizedSet(new LinkedHashSet<Composite>());
- private static Thread thread;
+ private static synchronized EMFFormsSWTLayoutOptimizer getLayoutOptimizer() {
+ if (layoutOptimizer == null) {
+ final Bundle bundle = FrameworkUtil.getBundle(EMFFormsSWTLayoutUtil.class);
+ final BundleContext bundleContext = bundle.getBundleContext();
+ final ServiceReference<EMFFormsSWTLayoutOptimizer> serviceReference = bundleContext
+ .getServiceReference(EMFFormsSWTLayoutOptimizer.class);
+ if (serviceReference != null) {
+ layoutOptimizer = bundleContext.getService(serviceReference);
+ } else {
+ layoutOptimizer = new EMFFormsSWTLayoutDelayed();
+ }
+ }
+ return layoutOptimizer;
+ }
/**
* This methods helps to update the size of a parent composite when the size of a child has changed. This is needed
@@ -81,11 +96,11 @@
}
if (parent.getParent() == null) {
- layoutDelayed(parent);
+ getLayoutOptimizer().layout(parent);
}
- if (Shell.class.isInstance(parent)) {
- layoutDelayed(parent);
+ else if (Shell.class.isInstance(parent)) {
+ getLayoutOptimizer().layout(parent);
}
parent = parent.getParent();
@@ -93,50 +108,6 @@
}
- /**
- * <p>
- * This method will collect layoutrequest that happen in the same 200ms. When there are multiple layoutrequest for
- * the same composite in this time frame, the composite will only be layouted once.
- * </p>
- * <p>
- * This will help to improve performance as layout request are usually expensive. Also it might be quite common that
- * e.g. multiple hide rules are triggered by the same condition.
- * </p>
- *
- * @param parent the composite to layout
- */
- private static synchronized void layoutDelayed(Composite parent) {
- requestedLayouts.add(parent);
- if (thread != null) {
- return;
- }
- thread = new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- Thread.sleep(200);
- } catch (final InterruptedException ex) {
- /* silent */
- }
- final Set<Composite> toLayout = requestedLayouts;
- requestedLayouts = Collections.synchronizedSet(new LinkedHashSet<Composite>());
- thread = null;
- for (final Composite composite : toLayout) {
- if (composite.isDisposed()) {
- continue;
- }
- composite.getDisplay().asyncExec(new Runnable() {
- @Override
- public void run() {
- composite.layout(true, true);
- }
- });
- }
- }
- });
- thread.start();
- }
-
private static void updateLayoutData(final Object layoutData, int oldHeight, int newHeight) {
if (layoutData instanceof GridData) {
final GridData gridData = (GridData) layoutData;
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 80ede0c..b156797 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.messages;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.table.util;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.table;version="1.11.0",
- org.eclipse.emfforms.spi.swt.table.util;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.table;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.messages;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.table.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.table;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.table.util;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.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 6612de1..4827a87 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8f9ff51..0f7c3de 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
@@ -50,7 +50,7 @@
private TableViewerCompositeBuilder tableViewerCompositeBuilder = new DefaultTableViewerCompositeBuilder();
- private TableViewerCreator tableViewerCreator = new TableViewerCreator() {
+ private TableViewerCreator<? extends AbstractTableViewer> tableViewerCreator = new TableViewerCreator<TableViewer>() {
@Override
public TableViewer createTableViewer(Composite parent) {
@@ -139,7 +139,7 @@
*
* @param creator the {@link TableViewerCreator}
*/
- public void setTableViewerCreator(TableViewerCreator creator) {
+ public void setTableViewerCreator(TableViewerCreator<? extends AbstractTableViewer> creator) {
tableViewerCreator = creator;
}
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
index 160e376..771f286 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/AbstractTableViewerComposite.java
@@ -166,7 +166,7 @@
* @return the applied layout
*
*/
- protected abstract AbstractColumnLayout createLayout(final Composite viewerComposite);
+ protected abstract AbstractColumnLayout createLayout(Composite viewerComposite);
/**
* Creates the table viewer.
@@ -177,7 +177,7 @@
* @return the table viewer
*/
protected abstract AbstractTableViewer createTableViewer(TableViewerSWTCustomization customization,
- final Composite viewerComposite);
+ Composite viewerComposite);
private void addColumns(TableViewerSWTCustomization customization, AbstractTableViewer tableViewer,
EMFDataBindingContext emfDataBindingContext) {
@@ -267,6 +267,6 @@
* @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);
+ public abstract void setComparator(TableViewerComparator comparator, List<Integer> sortableColumns);
}
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
index c8cfb83..21491f9 100644
--- 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
@@ -34,6 +34,14 @@
int getItemHeight();
/**
+ * Returns the number of items contained in the receiver.
+ *
+ * @return the number of items
+ * @since 1.12
+ */
+ int getItemCount();
+
+ /**
* Returns <code>true</code> if the receiver's header is visible,
* and <code>false</code> otherwise.
*
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 8202b57..67ce909 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
@@ -123,6 +123,11 @@
public int getHeaderHeight() {
return getTableViewer().getTable().getHeaderHeight();
}
+
+ @Override
+ public int getItemCount() {
+ return getTableViewer().getTable().getItemCount();
+ }
};
}
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 5a377d9..09dabc5 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
@@ -19,6 +19,7 @@
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emfforms.internal.swt.table.DefaultTableControlSWTCustomization;
import org.eclipse.emfforms.internal.swt.table.util.StaticCellLabelProviderFactory;
+import org.eclipse.jface.viewers.AbstractTableViewer;
import org.eclipse.jface.viewers.CellLabelProvider;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ViewerComparator;
@@ -140,7 +141,8 @@
* @param creator the {@link TableViewerCreator}
* @return self
*/
- public TableViewerSWTBuilder customizeTableViewerCreation(TableViewerCreator creator) {
+ public TableViewerSWTBuilder customizeTableViewerCreation(
+ TableViewerCreator<? extends AbstractTableViewer> creator) {
customization.setTableViewerCreator(creator);
return this;
}
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 1bd6daa..cafab7f 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
@@ -32,7 +32,8 @@
*
*/
public interface TableViewerSWTCustomization
- extends TableViewerCompositeBuilder, TableViewerCreator, ButtonBarBuilder, DNDProvider {
+ extends TableViewerCompositeBuilder, TableViewerCreator<AbstractTableViewer>, ButtonBarBuilder,
+ DNDProvider {
/**
* Returns the comparator to use.
@@ -150,7 +151,7 @@
/**
* Add the contents of the given map to the data map.
- *
+ *
* @param data object
*/
void setData(Map<String, Object> data);
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 747b093..6af4939 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.11.0"
+Export-Package: org.eclipse.emfforms.internal.swt.treemasterdetail.decorator.validation.ecp;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.swt.treemasterdetail.decorator.validation.ecp;version="1.12.0"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.treemasterdetail;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.jface.resource;version="0.0.0",
org.eclipse.jface.viewers;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail.decorator.validation.default/pom.xml
index 820df7c..707cf76 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
index 2a51844..da5dbae 100644
--- a/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emfforms.swt.treemasterdetail/META-INF/MANIFEST.MF
@@ -2,29 +2,29 @@
Bundle-ManifestVersion: 2
Bundle-Name: Treemasterdetail SWT Util
Bundle-SymbolicName: org.eclipse.emfforms.swt.treemasterdetail;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.11.0";x-friends:="org.eclipse.emfforms.editor.ecore",
- org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.11.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
- org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.11.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.11.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.11.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.11.0",
- org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.11.0"
+Export-Package: org.eclipse.emf.edit.ui.action.emfforms;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.treemasterdetail;version="1.12.0";x-friends:="org.eclipse.emfforms.editor.ecore",
+ org.eclipse.emfforms.internal.swt.treemasterdetail.defaultprovider;version="1.12.0";x-friends:="org.eclipse.emfforms.editor.ecore,org.eclipse.emfforms.editor",
+ org.eclipse.emfforms.spi.swt.treemasterdetail;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.actions.delegating;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.diagnostic;version="1.12.0",
+ org.eclipse.emfforms.spi.swt.treemasterdetail.util;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.equinox.registry;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.0)",
org.eclipse.jface.action;version="0.0.0",
org.eclipse.jface.databinding.viewers;version="0.0.0",
org.eclipse.jface.layout;version="0.0.0",
diff --git a/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml b/bundles/org.eclipse.emfforms.swt.treemasterdetail/pom.xml
index e4f7fb8..e6b6704 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 6ff99d2..37b1e56 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
@@ -512,6 +512,9 @@
view, eObject, customization.getViewModelServices(view, eObject));
renderedView = ECPSWTViewRenderer.INSTANCE.render(limbo, modelContext);
label.dispose();
+ if (detailPanel.isDisposed()) {
+ return;
+ }
renderedView.getSWTControl().setParent(detailPanel);
detailPanel.layout(true, true);
if (ScrolledComposite.class.isInstance(detailComposite)) {
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 247233e..94dc87e 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model.provider;version="1.12.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.11.0,1.12.0)",
+ org.eclipse.emfforms.view.annotation.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
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 c201e9c..cdf4c36 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 377bb15..2ef8a0f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.11.0",
- org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.11.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
+Export-Package: org.eclipse.emf.emfforms.spi.view.annotation.model;version="1.12.0",
+ org.eclipse.emf.emfforms.spi.view.annotation.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.emfforms.spi.view.annotation.model.util;version="1.12.0";x-friends:="org.eclipse.emfforms.view.annotation.model.edit"
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 ce4ff3a..9cd7feb 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8360fd6..dc0f9f2 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model.provider;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emfforms.view.controlgrid.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
-Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.11.0,1.12.0)";resolution:=optional,
- org.eclipse.emf.ecp.view.spi.table.model;version="[1.11.0,1.12.0)";resolution:=optional
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
+Import-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.model;version="[1.12.0,1.13.0)";resolution:=optional,
+ org.eclipse.emf.ecp.view.spi.table.model;version="[1.12.0,1.13.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml b/bundles/org.eclipse.emfforms.view.controlgrid.model.edit/pom.xml
index a6f158b..bceb17e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 90b6d6d..3d92e05 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.11.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.11.0",
- org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.emfforms.spi.view.controlgrid.model;version="1.12.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.impl;version="1.12.0",
+ org.eclipse.emf.emfforms.spi.view.controlgrid.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 008c2c7..2648d41 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 42785c5..ada572d 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.view;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.locale;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.view;version="[1.12.0,1.13.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 b4c33d8..1331c2f 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.bundles/</relativePath>
</parent>
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 23e98c3..68f0686 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Framework
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e3;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
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 60d2cb1..2d976a4 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 bf0f560..6200914 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.application.sample.e4.parts;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)"
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/pom.xml b/examples/org.eclipse.emf.ecp.makeithappen.application.sample.e4/pom.xml
index bc6d139..037a9d6 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 acd82ff..86412a2 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.rap.jface;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.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 1d967a2..e04fc52 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,14 +5,14 @@
<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_111"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_112"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rap.feature.feature.group" version="0"/>
-<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0"/>
-<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="0"/>
+<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/neon/"/>
</location>
</locations>
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 6309996..0c1c74b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d25a2c40..02de970 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.makeithappen.model.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.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 1d967a2..e04fc52 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,14 +5,14 @@
<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_111"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_112"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rap.feature.feature.group" version="0"/>
-<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0"/>
-<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="0"/>
+<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/neon/"/>
</location>
</locations>
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 7a77965..48d6886 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d92c6d8..f3a146c 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emf.ecp.makeithappen.model"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 d0b6f8a..4ff0e59 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 dd667c1..32c754e 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task.provider;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.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 0d58e79..52e444b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 3c74efe..dd0732f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.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 aa20627..e1c20dc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 6045725..49bff3c 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.11.0",
- org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.11.0",
- org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.makeithappen.model.task;version="1.12.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.impl;version="1.12.0",
+ org.eclipse.emf.ecp.makeithappen.model.task.util;version="1.12.0"
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 f9d9328..529ae04 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a49a4af..b335d87 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.makeithappen.ui.emailcontrol;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 dc0accc..052823c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e746243..cf7cca9 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0",
+Export-Package: org.eclipse.emf.ecp.makeithappen.view.group.swt.pgroup;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+Require-Bundle: org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)"
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.11.0,1.12.0)",
+ org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 fa1302c..6547957 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 593a2ce..ff0870e 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.makeithappen.internal.wizards;version="1.12.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 988c1c2..f032a76 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
diff --git a/features/org.eclipse.emf.ecp.all.feature/.project b/features/org.eclipse.emf.ecp.all.feature/.project
deleted file mode 100644
index 395f419..0000000
--- a/features/org.eclipse.emf.ecp.all.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.ecp.nosite.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.emf.ecp.all.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.all.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/features/org.eclipse.emf.ecp.all.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.all.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.all.feature/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/features/org.eclipse.emf.ecp.all.feature/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.all.feature/build.properties b/features/org.eclipse.emf.ecp.all.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.emf.ecp.all.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.emf.ecp.all.feature/feature.xml b/features/org.eclipse.emf.ecp.all.feature/feature.xml
deleted file mode 100644
index 772966e..0000000
--- a/features/org.eclipse.emf.ecp.all.feature/feature.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.ecp.nosite.feature"
- label="ECP Feature for features which are not in the SDK"
- version="1.8.0.qualifier"
- provider-name="Eclipse Modeling Project"
- license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.1.1.qualifier">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="http://www.example.com/license">
- [Enter License Description here.]
- </license>
-
- <includes
- id="org.eclipse.emf.ecp.diffmerge.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.test.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.graphiti.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.examplemodel.ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.application.e4.fx.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.view.sdk.fx.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.ecore.editor.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.ecore.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.ecp.view.groupedgrid.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.ecp.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.ecp.rap.util"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
index 74387ce..f017eeb 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 c81a745..6739f7b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c0475d8..c712e57 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 02ebd46..48faef1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 44d52da..fdcd550 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 1590c0e..c79841a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 64fcad8..c5047bb 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 73a519d..a21de47 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 808150a..95f6b96 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 2dd21b4..75aaa15 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 32e4aca..c5cfcd6 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 a73fde1..28420dc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 96dd83c..784f867 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 7919ae2..1667869 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 54b741e..3dc6427 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 2a2cf82..c0d02e3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2c11b63..2380228 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 277576a..afbbed5 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 5363e5f..234accf 100644
--- a/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emf2web.feature/feature.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.ecp.emf2web.feature"
- label="EMF2Web Feature"
+ label="JSON Forms Integration"
version="1.0.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 bf5e037..458b8b7 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng.features/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
@@ -28,9 +28,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml b/features/org.eclipse.emf.ecp.emfforms.idetooling.feature/feature.xml
index e776af9..44640b1 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 7aecc1c..4f66e1b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a20dd78..319f924 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 f671c0d..3babe2d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1c9ecdc..c31d514 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.0.qualifier">
<description>
%description
@@ -62,6 +62,14 @@
<includes
id="org.eclipse.emf.ecp.workspace.feature"
version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.emf2web.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.ecp.emf2web.feature.source"
+ version="0.0.0"/>
<includes
id="org.eclipse.emf.ecp.emfforms.idetooling.feature.source"
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 bc7c255..bc8dbed 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c90c0f3..60d2e06 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 272d6bf..d9df0bb 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 9370f57..197ab71 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 fa246e8..4818677 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 046f2cc..1e88866 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 ed5d02f..c5e2009 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 638cda8..c662401 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.11.0.qualifier"
+ version="1.12.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 89aa29d..6be13a2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 b18edb0..c4b974e 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 333e915..1bfc17f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 bc83072..1b1cc75 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 dd506e2..8c539ef 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1a62123..abe7164 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 02d1ded..3940f71 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 5163a60..6c53851 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 a14eb92..c86ed67 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e97bd10..8a316eb 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 25fc1ef..537b81a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d30be62..7a3ffb2 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 44333e2..aba9c94 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0508573..c01414a 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 ca8fc0a..c8e3f9f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 b978653..cf549e4 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 65205cf..c5d5c61 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 5818ccb..7ce758b 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 7f89e61..0d6e7e8 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 606b759..f5d0575 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 1b06ece..39e7cc1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 aba9038..2fd8cdc 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 b301f43..90b8737 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 69c4add..161ef80 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 1a3297a..f3e043c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8a23d54..d82c6ea 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 bf7cf06..12d6cc5 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 680c2ec..491154d 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 8e93efc..909c37d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 42051b8..06a85da 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 6739dc4..16954e9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 77b0d78..e3a7fb2 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 7ad99b9..39ab0ca 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 f22a0bd..4c7386a 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 5188d0a..ee8d5fc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 879b191..914482b 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 ca8b807..b0c7832 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0e87c44..0d18ff6 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 5ebc6bc..5032fb5 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 711f419..68e52bf 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 a15b31e..17fea70 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 5c80aad..e1ec8cf 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 039df20..17f212d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2d3ad15..e788fc1 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 e7f7cab..83ef99d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7277086..870e0b6 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 8dd42e0..090e93a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.model.feature/feature.xml b/features/org.eclipse.emf.ecp.view.model.feature/feature.xml
index 0533bbd..5e20d49 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 70d2b23..750ed13 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 9a86bf6..a113aff 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 3f2b320..5958870 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1c50cb4..17dc591 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 1410d7a..0e1ab04 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 dd0a690..2b75490 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 f654d5b..ef0e486 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d0393d1..65b12ca 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 d59f019..919e5f0 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 77f8da3..d433613 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 b3d3121..f421ba2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
index 16c85ee..c543593 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature"
label="EMF Forms Nebula Grid Table UI Feature"
- version="1.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
index 4240a0c..b74f90c 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.nebula.grid.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
index 32f6f41..03edfaa 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/feature.xml
@@ -2,9 +2,9 @@
<feature
id="org.eclipse.emf.ecp.view.table.ui.rcp.feature"
label="Feature"
- version="1.11.0.qualifier"
+ version="1.12.0.qualifier"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
index 7335b97..bdfa07b 100644
--- a/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.view.table.ui.rcp.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 14e6c3c..af7f1fe 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 b859f57..da7e172 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1e3f83c..c82c140 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 c348aa1..c03d2b7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 08301ba..e797ea6 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 ab4f1b1..4ed97ae 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 6252fb0..e55c05f 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 7805d98..c3f20ad 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d021d6a..1e336ee 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 b51b595..e2dd170 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ca30485..fefed85 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 6a0392d..df895ca 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 646187b..4f33318 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 5c753a5..a1bfcfc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 77abcc7..64ee952 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 14ebe0d..327485a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a64dbf3..26729d8 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 e0d1c59..759e629 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 06efd35..0f278a4 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 e13170f..398e9d6 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 9962de9..f1ab264 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.editor"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 45ca086..a45baa7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
index c6835b6..98cc65f 100644
--- a/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.editor.genmodel.util.feature"
label="EMFForms GenModel Editor Util"
- version="1.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
index 4f83c69..45a441c 100644
--- a/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
+++ b/features/org.eclipse.emfforms.editor.genmodel.util.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
index 5dff07c..a61e564 100644
--- a/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
+++ b/features/org.eclipse.emfforms.rulerepository.feature/feature.xml
@@ -2,12 +2,12 @@
<feature
id="org.eclipse.emfforms.rulerepository.feature"
label="EMFForms RuleRepository Feature"
- version="1.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.rulerepository.feature/pom.xml b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
index ad8740c..9939cef 100644
--- a/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
+++ b/features/org.eclipse.emfforms.rulerepository.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a88172c..3d4b8a5 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.11.0.qualifier"
+ version="1.12.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.emfforms.swt.control.multiattribute"
license-feature="org.eclipse.emf.ecp.license.feature"
- license-feature-version="1.11.0.qualifier">
+ license-feature-version="1.12.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 3a46225..33c2f65 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d60f21d..30d122b 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 bc40e21..e9f603a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
index aa9030c..1c5943d 100644
--- a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emfforms.swt.control.text.richtext.feature"
label="EMF Forms Rich Text Feature"
- version="1.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.0.qualifier">
<description>
%description
diff --git a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
index d74fc532..8f886c7 100644
--- a/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
+++ b/features/org.eclipse.emfforms.swt.control.text.richtext.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-features-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 b32a875..e6a292e 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 2551118..60d31d2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8ce03f1..64745f0 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 c056843..0d5ab0f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7acc6fa..e8ca912 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.11.0.qualifier">
+ license-feature-version="1.12.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 d706a0f..ec7335e 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.11.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.12.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 2a4ea0a..36ad21c 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.11.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.12.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 bc07d2c..58b7b95 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 af9a387..66095cf 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<!-- Parent for the rap product. Needed to reduce environments.
diff --git a/releng/org.eclipse.emf.ecp.rap.products/pom.xml b/releng/org.eclipse.emf.ecp.rap.products/pom.xml
index 91b45ad..47c7a24 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 576ef52..a529c90 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.examples/pom.xml b/releng/org.eclipse.emf.ecp.releng.examples/pom.xml
index 9a40c43..e92c8ee 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0898337..5bc219b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/releng/org.eclipse.emf.ecp.releng.tests/pom.xml b/releng/org.eclipse.emf.ecp.releng.tests/pom.xml
index 04c4072..f71f66f 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<profiles>
diff --git a/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyleTest.xml b/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyleTest.xml
index 325cd2a..3c8e170 100644
--- a/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyleTest.xml
+++ b/releng/org.eclipse.emf.ecp.releng/checkstyle/esmCheckstyleTest.xml
@@ -158,7 +158,7 @@
<property name="max" value="30"/>
</module>
<module name="ThrowsCount">
- <property name="max" value="3"/>
+ <property name="max" value="10"/>
</module>
<module name="UncommentedMain"/>
<module name="CyclomaticComplexity">
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index 76e057a..8213a80 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0</ecp-version>
+ <ecp-version>1.12.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/pom.xml b/releng/org.eclipse.emf.ecp.repository.target/pom.xml
index 6bd8f8a..487191b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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/pom.xml b/releng/org.eclipse.emf.ecp.repository/pom.xml
index 37d3860..14d1c0a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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_withECP.target b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
index 37b2d98..6f6b5e4 100644
--- a/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
+++ b/releng/org.eclipse.emf.ecp.target.rap/ecpRAP_withECP.target
@@ -28,7 +28,7 @@
<unit id="org.eclipse.emf.ecp.rap.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.rap.util.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/ecp/releases/releases_target_111"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_112"/>
</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 d8a0bbc..405d801 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecpRAP</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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/pom.xml b/releng/org.eclipse.emf.ecp.target.rcp/pom.xml
index f216219..4de1207 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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp</artifactId>
- <version>1.11.0-SNAPSHOT</version>
+ <version>1.12.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 6600c1a..85a220c 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_111/"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_target_112/"/>
</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"/>
diff --git a/tests/ECPQ7Tests/EPPTests/download.sh b/tests/ECPQ7Tests/EPPTests/download.sh
new file mode 100755
index 0000000..0cc44bc
--- /dev/null
+++ b/tests/ECPQ7Tests/EPPTests/download.sh
@@ -0,0 +1,8 @@
+if [ $# -lt 3 ]; then
+ exit
+fi
+AUT_DIR="$1/aut"
+rm -rf ${AUT_DIR}/*
+mkdir -p ${AUT_DIR}
+cd ${AUT_DIR}
+wget -q -O $2_$3.tar.gz https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/$2/$3/eclipse-modeling-$2-$3-linux-gtk-x86_64.tar.gz --proxy=off
\ No newline at end of file
diff --git a/tests/ECPQ7Tests/EPPTests/pom.xml b/tests/ECPQ7Tests/EPPTests/pom.xml
index f27047a..2f564d8 100644
--- a/tests/ECPQ7Tests/EPPTests/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/pom.xml
@@ -18,61 +18,95 @@
<profile>
<id>local</id>
<properties>
- <eclipse-product>http://ftp.fau.de/eclipse/technology/epp/downloads/release/${eclipse-name}/${eclipse-sr}/eclipse-modeling-${eclipse-name}-${eclipse-sr}-win32-x86_64.zip</eclipse-product>
+ <aut-path>/home/eugen/tmp/ecp</aut-path>
</properties>
</profile>
</profiles>
<properties>
<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>
+ <aut-path>/home/data/httpd/download.eclipse.org/ecp</aut-path>
</properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.rcptt</groupId>
- <artifactId>rcptt-maven-plugin</artifactId>
- <version>${rcptt-maven-version}</version>
- <extensions>true</extensions>
- <configuration>
- <runner>
- <version>${rcptt-runner-version}</version>
- </runner>
- <aut>
-
- <explicit>${eclipse-product}</explicit>
-
- <!--win32-x86_64.zip-->
- <!--linux-gtk-x86_64.tar.gz-->
-
- <injections>
- <injection>
- <site>${emfstore-update-site}</site>
- <features>
- <feature>org.eclipse.emf.emfstore.server.feature.feature.group</feature>
- <feature>org.eclipse.emf.emfstore.ecore.feature.feature.group</feature>
- <feature>org.eclipse.emf.emfstore.example.feature.feature.group</feature>
- <feature>org.eclipse.emf.emfstore.client.feature.feature.group</feature>
- <feature>org.eclipse.emf.emfstore.common.feature.feature.group</feature>
- <feature>org.eclipse.emf.emfstore.client.transaction.feature.feature.group</feature>
- <feature>org.eclipse.emf.emfstore.client.ui.feature.feature.group</feature>
- </features>
- </injection>
- <injection>
- <site>${currentBuild}/org.eclipse.emf.ecp.repository.target/target/repository</site>
- <features>
- <feature>org.eclipse.emf.ecp.sdk.feature.feature.group</feature>
- </features>
- </injection>
- </injections>
- </aut>
- <projects>
- <project>${project.basedir}/../project</project>
- </projects>
-
- </configuration>
- </plugin>
- </plugins>
- </build>
-
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <executions>
+ <execution>
+ <id>Download Eclipses</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>${project.basedir}/../../download.sh</executable>
+ <arguments>
+ <argument>${aut-path}</argument>
+ <argument>${eclipse-name}</argument>
+ <argument>${eclipse-sr}</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.eclipse.rcptt</groupId>
+ <artifactId>rcptt-maven-plugin</artifactId>
+ <version>${rcptt-maven-version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <runner>
+ <version>${rcptt-runner-version}</version>
+ </runner>
+ <aut>
+
+ <explicit>${aut-path}/aut/${eclipse-name}_${eclipse-sr}.tar.gz</explicit>
+
+ <injections>
+ <injection>
+ <site>${emfstore-update-site}</site>
+ <features>
+ <feature>org.eclipse.emf.emfstore.server.feature.feature.group</feature>
+ <feature>org.eclipse.emf.emfstore.ecore.feature.feature.group</feature>
+ <feature>org.eclipse.emf.emfstore.example.feature.feature.group</feature>
+ <feature>org.eclipse.emf.emfstore.client.feature.feature.group</feature>
+ <feature>org.eclipse.emf.emfstore.common.feature.feature.group</feature>
+ <feature>org.eclipse.emf.emfstore.client.transaction.feature.feature.group</feature>
+ <feature>org.eclipse.emf.emfstore.client.ui.feature.feature.group</feature>
+ </features>
+ </injection>
+ <injection>
+ <site>${currentBuild}/org.eclipse.emf.ecp.repository.target/target/repository</site>
+ <features>
+ <feature>org.eclipse.emf.ecp.sdk.feature.feature.group</feature>
+ </features>
+ </injection>
+ </injections>
+ <args>
+ <arg>-nosplash</arg>
+ <arg>-consoleLog</arg>
+ <arg>--launcher.GTK_version</arg>
+ <arg>2</arg>
+ </args>
+ <vmArgs>
+ <vmArg>-Xmx2g</vmArg>
+ <vmArg>-Dorg.eclipse.swt.browser.DefaultType=mozilla</vmArg>
+ </vmArgs>
+ </aut>
+ <projects>
+ <project>${project.basedir}/../project</project>
+ </projects>
+ <testOptions>
+ <execTimeout>10800</execTimeout>
+ <testExecTimeout>600</testExecTimeout>
+ </testOptions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml b/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml
index 5ac42ee..6a149d9 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/update-site/current/pom.xml
@@ -13,6 +13,14 @@
<properties>
<eclipse-name>neon</eclipse-name>
- <eclipse-sr>R</eclipse-sr>
+ <eclipse-sr>2</eclipse-sr>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml b/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml
index b460a03..8b6bc4c 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml
+++ b/tests/ECPQ7Tests/EPPTests/update-site/previous/pom.xml
@@ -15,4 +15,12 @@
<eclipse-name>mars</eclipse-name>
<eclipse-sr>2</eclipse-sr>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>exec-maven-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/EmptyWorkbench.ctx b/tests/ECPQ7Tests/EPPTests/update-site/project/EmptyWorkbench.ctx
index 5e511ac..97917da 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/EmptyWorkbench.ctx
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/EmptyWorkbench.ctx
@@ -1,22 +1,22 @@
---- Q7 testcase ---
+--- RCPTT testcase ---
Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
-Context-Type: com.xored.q7.ui.context.workbench
+Context-Type: org.eclipse.rcptt.ctx.workbench
Element-Name: EmptyWorkbench
Element-Type: context
Element-Version: 2.0
Id: _ihvnUC3mEeSwhO5Nwx0hPg
-Q7-Runtime-Version: 1.3.10.201312200736
-Save-Time: 8/27/14 2:34 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 1/30/17 9:32 AM
------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf
Content-Type: q7/binary
Entry-Name: .q7.content
-UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAAALmNvbnRlbnRtjssOwiAQRff9CjJ7wUdMTSN1YVy4
-8JEYozujLRaiMJai4N+LJu3K7T33npnpLOg7eQnbKDQcBrQPRJgCS2UqDk937U1glifTAjUNaEVJ65Q2
-hTBnqzA7oL1dYl3O0TgRHAlaZZ1s+JVFvWmymHOQzj0yxrz3FHVF0VbsuFq2lb8XulGk7EdZnbKWUlHE
-CIg5a8FhoR/u3X0ERJUcTkq+zH4+0gux83IzXvvQl9sKWJ58AFBLBwimESoPswAAAPoAAABQSwECFAAU
-AAgICAAAACEAphEqD7MAAAD6AAAACAAAAAAAAAAAAAAAAAAAAAAALmNvbnRlbnRQSwUGAAAAAAEAAQA2
-AAAA6QAAAAAA
+UEsDBBQACAgIAAAAIQAAAAAAAAAAAAAAAAAIAAkALmNvbnRlbnRVVAUAAQAAAACVkLFOwzAQhvc8heW9
+dgEhoShJhyoDA1AJIdhQcA7bNPZZthubt8cFJWJhYL37vv8/XbPLZiIz+KDRtvSCbSkBK3DUVrb0FN83
+N3TXVQ16yUBM2gVgXrgYWRBgB6+xfkZ/fCuO2qONkCPJRtdr4uU5sXTYUJd5S1WMruY8pcTQSFZy+cvd
+7YL8XbOay/psfiPc4AgTX8DiowdK7GCgpb1x8XO9kBI9tvRVq9k+7a9MD49JPVzfp7xVB0m7ipBm1pBC
+9/uOk2Z2mLUcInp28PgBIvbZTaXFN/yHrxr+jw911RdQSwcI8EEj0+EAAAB3AQAAUEsBAhQAFAAICAgA
+AAAhAPBBI9PhAAAAdwEAAAgACQAAAAAAAAAAAAAAAAAAAC5jb250ZW50VVQFAAEAAAAAUEsFBgAAAAAB
+AAEAPwAAACABAAAAAA==
------=_.q7.content-3d2e0690-ce48-3609-83e0-c704d49f1eaf--
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
index edcee7c..044b73d 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/GettingStarted.test
@@ -7,7 +7,7 @@
External-Reference:
Id: _lx7aYE_YEeWlOMw7vcjT4A
Runtime-Version: 2.1.0.201606221726
-Save-Time: 9/5/16 12:56 PM
+Save-Time: 1/30/17 9:39 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -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 9 | get-property "getChildren().length" | equals 9
+ get-control Any -after [get-label "View Editor Preview"] -index 10 | 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 9] {
+with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 10] {
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 9] {
+with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 10] {
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 10 | get-property "getLayout().numColumns"
+ get-control Any -after [get-label "View Editor Preview"] -index 11 | 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 24dcd30..6c2314a 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/Installation.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/Installation.test
@@ -7,7 +7,7 @@
External-Reference:
Id: _jbzigJ7xEeOleLZC7V9mLg
Runtime-Version: 2.1.0.201606221726
-Save-Time: 9/5/16 12:44 PM
+Save-Time: 1/30/17 9:51 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -19,7 +19,7 @@
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_110"
+ get-editbox -after [get-label "Location:"] | set-text "http://download.eclipse.org/ecp/releases/releases_target_112"
get-button OK | click
}
}
@@ -27,7 +27,7 @@
| verify-true
with [get-window Install] {
with [get-tree] {
- get-item "All SDKs \\(install one of these\\)/EMF Forms SDK" | check
+ get-item "All SDKs \\(install one of these\\)/ECP SDK 3.x" | check
}
with [get-button "Next >"] {
click
@@ -35,9 +35,7 @@
}
}
get-window Install | get-editbox -after [get-label "License text:"] | get-property text | is-empty | verify-false
-get-window Install | get-tree | get-property itemCount | equals 2 | verify-true
+get-window Install | get-tree | get-property itemCount | equals 1 | verify-true
get-window Install | get-tree | get-item "Eclipse Foundation Software User Agreement" | get-property caption
| equals "Eclipse Foundation Software User Agreement" | verify-true
-get-window Install | get-tree | get-item "Eclipse Foundation Software User Agreement" -index 1 | get-property caption
- | equals "Eclipse Foundation Software User Agreement" | verify-true
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
index 5ebfd54..1d13518 100644
--- a/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
+++ b/tests/ECPQ7Tests/EPPTests/update-site/project/ViewEditor_smoke.test
@@ -7,7 +7,7 @@
External-Reference:
Id: _foqG8GzgEeWQGtcwdcx-qw
Runtime-Version: 2.1.0.201606221726
-Save-Time: 9/5/16 12:59 PM
+Save-Time: 1/30/17 9:46 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -39,7 +39,7 @@
}
get-button Finish | click
}
-with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 9] {
+with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 10] {
get-property backgroundColor | equals "#FFFFFF" | verify-true
get-property "getChildren().length" | equals 3 | verify-true
@@ -81,7 +81,7 @@
get-button Finish | click
}
-with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 7] {
+with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 8] {
get-property "getChildren().length" | equals 1 | verify-true
get-property "getChildren().Control[0].getChildren().length" | equals 1 | verify-true
get-property "getChildren().Control[0].getChildren().Control[0].getChildren().Control[0].getChildren().Control[0].getChildren().Control[0].getClassName()"
@@ -167,7 +167,7 @@
get-button Finish | click
}
-with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 9] {
+with [get-view "EMF Forms Preview" | get-control Any -after [get-label "View Editor Preview"] -index 10] {
get-property "getChildren().length" | equals 3 | verify-true
get-property "getChildren().Control[0].getClassName()" | equals "org.eclipse.swt.widgets.Label" | verify-true
get-property "getChildren().Control[0].getText()" | equals "First Name" | verify-true
@@ -202,7 +202,7 @@
get-tree | select View/Control | get-menu Delete | click
}
with [get-view "EMF Forms Preview"] {
- with [get-control Any -after [get-label "View Editor Preview"] -index 9] {
+ with [get-control Any -after [get-label "View Editor Preview"] -index 10] {
get-property "getChildren().Control[0].getClassName()" | equals "org.eclipse.swt.widgets.Label" | verify-true
get-property "getChildren().Control[0].getText()" | equals "This is a label" | verify-true
get-property "getChildren().Control[0].getAlignment()" | equals 16384 | verify-true
@@ -213,7 +213,7 @@
with [get-label "This is a label"] {
get-property backgroundColor | equals "#FFFFFF" | verify-true
get-property foregroundColor | equals "#000000" | verify-true
- get-property "getFont().getFontData().FontData[0].height" | equals "9.75" | verify-true
+ get-property "getFont().getFontData().FontData[0].getHeight()" | equals 10 | verify-true
}
}
@@ -255,7 +255,7 @@
get-property backgroundColor | equals "#FFFFFF" | verify-true
get-property foregroundColor | equals "#000000" | verify-true
get-property "getFont().getFontData().FontData[0].getStyle()" | equals 0 | verify-true
- get-property "getFont().getFontData().FontData[0].getHeight()" | equals 9 | verify-true
+ get-property "getFont().getFontData().FontData[0].getHeight()" | equals 10 | verify-true
get-property "getStyle()" | contains "SEPARATOR" | verify-true
get-property "getStyle()" | contains "SHADOW_OUT" | verify-true
get-property "getStyle()" | contains "NO_FOCUS" | verify-true
diff --git a/tests/ECPQ7Tests/NonEPPTests/Validation/Validation_smokeTest.test b/tests/ECPQ7Tests/NonEPPTests/Validation/Validation_smokeTest.test
index 9eb3a52..ae2c3da 100644
--- a/tests/ECPQ7Tests/NonEPPTests/Validation/Validation_smokeTest.test
+++ b/tests/ECPQ7Tests/NonEPPTests/Validation/Validation_smokeTest.test
@@ -6,8 +6,8 @@
Element-Version: 3.0
External-Reference:
Id: _lnMCYGtVEeWukfCGOpNfzw
-Runtime-Version: 2.0.0.201506120617
-Save-Time: 4/19/16 6:20 PM
+Runtime-Version: 2.1.0.201606221726
+Save-Time: 1/30/17 9:59 AM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -78,17 +78,19 @@
with [get-editor Matchup | get-label -after [get-label Games]] {
get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
- get-property "getToolTipText()" | contains "with 0 values must have at least 2 values" | verify-true
+ //Table Change
+ //get-property "getToolTipText()" | contains "with 0 values must have at least 2 values" | verify-true
}
get-editor Matchup | get-button "Add an instance of Game" | click
with [get-editor Matchup | get-label -after [get-label Games]] {
get-property "getImage().getBounds().toString()" | equals "Rectangle {0, 0, 16, 17}" | verify-true
- get-property "getToolTipText()" | contains "with 1 values must have at least 2 values" | verify-true
+ //Table Change
+ //get-property "getToolTipText()" | contains "with 1 values must have at least 2 values" | verify-true
}
get-editor Matchup | get-button "Add an instance of Game" | click
with [get-editor Matchup] {
- get-label -after [get-label Games] | get-property "getToolTipText()" | equals "" | verify-true
+ //get-label -after [get-label Games] | get-property "getToolTipText()" | equals "" | verify-true
get-button "Add an instance of Game" | get-property enablement | equals false | verify-true
}
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 7bc123b..b727c7d 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker.provider;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.provider.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.workspace.core;bundle-version="[1.12.0,1.13.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 ddd4015..d3134e6 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8411278..629f26a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.changebroker;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.changebroker.test;version="1.12.0";x-internal:=true
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 0358713..c001f28 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0d26b68..0cfccbf 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.common.spi;version="1.11.0",
- org.eclipse.emf.ecp.common.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.common.test.model.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.common.spi;version="1.12.0",
+ org.eclipse.emf.ecp.common.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.common.test.model.util;version="1.12.0";x-internal:=true
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/build.properties b/tests/org.eclipse.emf.ecp.common.test/build.properties
index e70403b..e8fd0ca 100644
--- a/tests/org.eclipse.emf.ecp.common.test/build.properties
+++ b/tests/org.eclipse.emf.ecp.common.test/build.properties
@@ -11,8 +11,8 @@
bin.includes = .,\
model/,\
META-INF/,\
- plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ fragment.xml
jars.compile.order = .
source.. = src/
output.. = bin/
diff --git a/tests/org.eclipse.emf.ecp.common.test/fragment.xml b/tests/org.eclipse.emf.ecp.common.test/fragment.xml
new file mode 100644
index 0000000..fa153fc
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.common.test/fragment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<fragment>
+
+ <extension
+ name=""
+ point="org.eclipse.emf.ecore.generated_package">
+ <package
+ genModel="model/ecp.common.test.genmodel"
+ uri="http://eclipse.org/ecp/common/test/model"
+ class="org.eclipse.emf.ecp.common.test.model.TestPackage">
+ </package>
+ </extension>
+
+</fragment>
diff --git a/tests/org.eclipse.emf.ecp.common.test/plugin.xml b/tests/org.eclipse.emf.ecp.common.test/plugin.xml
deleted file mode 100644
index 2f2873d..0000000
--- a/tests/org.eclipse.emf.ecp.common.test/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- 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
--->
-
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <!-- @generated ecp.common.test -->
- <package
- uri="http://eclipse.org/ecp/common/test/model"
- class="org.eclipse.emf.ecp.common.test.model.TestPackage"
- genModel="model/ecp.common.test.genmodel"/>
- </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.emf.ecp.common.test/pom.xml b/tests/org.eclipse.emf.ecp.common.test/pom.xml
index cd624bc..cfc8fde 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 cbbd1b6..39582b9 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core Rap Sessionprovider Test
Bundle-SymbolicName: org.eclipse.emf.ecp.core.rap.sessionprovider.test
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.11.0"
-Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.11.0,1.12.0)"
+Export-Package: org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="1.12.0"
+Require-Bundle: org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.rap.rwt.service;version="0.0.0"
Service-Component: OSGI-INF/component.xml
diff --git a/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml b/tests/org.eclipse.emf.ecp.core.rap.sessionprovider.test/pom.xml
index 6800dc2..926f939 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d8bac43..9e428ee 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.core.rap.test;version="1.12.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.core.rap;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core.rap;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core.rap;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.core.runtime;version="0.0.0",
- org.eclipse.emf.ecp.core;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.core.rap;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core.internal;version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.core;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core.rap;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core.rap.sessionprovider.test;version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core.internal;version="[1.12.0,1.13.0)",
org.osgi.framework;version="0.0.0"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.core.rap.test/RAPFactories_PTest.launch b/tests/org.eclipse.emf.ecp.core.rap.test/RAPFactories_PTest.launch
index fb7524e..b59c9b2 100644
--- a/tests/org.eclipse.emf.ecp.core.rap.test/RAPFactories_PTest.launch
+++ b/tests/org.eclipse.emf.ecp.core.rap.test/RAPFactories_PTest.launch
@@ -71,7 +71,6 @@
<setEntry value="org.eclipse.emf.ecp.graphiti.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.ide.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.license.feature:default"/>
-<setEntry value="org.eclipse.emf.ecp.nosite.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.test.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.view.categorization.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.view.custom.feature:default"/>
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 80d9439..8df87f8 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 08b6177..aa9715c 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.core.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.core.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.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 7947549..f798b4a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4d8e9e6..ca116cc 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.diffmerge.context;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.diffmerge.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
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 b07967c..9072775 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 26f4896..7a77aed 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ecore.editor;bundle-version="[1.12.0,1.13.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 04657ed..c2fb383 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 cfa8a7c..3c3dc0b 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.edit.internal.swt.util;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.edit.internal.swt.util;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.12.0,1.13.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 1b8bb98..587c200 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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.ide.util.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.util.test/META-INF/MANIFEST.MF
index 22a79a6..00b57ce 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ide.util.test;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ide.util;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
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 642c1be..1177a62 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.ide.view.service.test/META-INF/MANIFEST.MF
index 228893b..1a98f20 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.ide.view.service.test;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ide.view.service;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.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 601f0bd..dd9ce35 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 39290bf..581a52c 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.integrationtest.Activator
-Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.integrationtest;version="1.12.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 7401c15..92d47d9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 025f6ab..569735a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.quickfix;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.ui.quickfix.test;version="1.12.0";x-internal:=true
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 11f6118..e818538 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d0645f1..ab46069 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.test.university.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.12.0,1.13.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 336c25a..23f6946 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 dbe2cc7..cf6621a 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.11.0.qualifier">
+ version="1.12.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 f0e490f..fc33c03 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4099e2c..6fc8ffd 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.test.university;version="1.11.0",
- org.eclipse.emf.ecp.test.university.impl;version="1.11.0",
- org.eclipse.emf.ecp.test.university.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.test.university;version="1.12.0",
+ org.eclipse.emf.ecp.test.university.impl;version="1.12.0",
+ org.eclipse.emf.ecp.test.university.util;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
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 5c59905..adaddc3 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a9bbbd0..964313a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.validation;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.ui.validation.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.12.0,1.13.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 17a2cc9..666a285 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c778586..6911afc 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.editor.controls;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.11.0",
- org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.ui.view.editor.controls.test;version="1.12.0",
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.ui.view.editor.test.model.test.util;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.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 10b6ea1..88bfb15 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 96b391b..f8cd981 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.ui.view.linewrapper;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.linewrapper.tests;version="1.12.0";x-internal:=true
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 0148479..d3c0c29 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c03a721..896b4ca 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.ui.view.swt.test;version="1.11.0"
+Fragment-Host: org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.ui.view.swt.test;version="1.12.0"
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)"
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 4cfc727..8fea3e6 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4904fc2..be78fcb 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.11.0.qualifier
-Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.11.0"
+Bundle-Version: 1.12.0.qualifier
+Export-Package: org.eclipse.emf.ecp.ui.view.test;version="1.12.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="4.10.0",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.generator;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.explorereditorbridge;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)"
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 6757c94..101d98f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4713722..3a8fb41 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.validation.diagnostician;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.validation.diagnostician.test;version="1.12.0";x-internal:=true
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 9ca74ae..ce9ffc4 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a613b9f..ab5abe4 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.validation;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.validation.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.validation.test.test.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.validation.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.validation.test.test.util;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)"
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 db5daa4..781c7e7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a3628f1..1ffd12e 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.11.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.11.0"
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.categorization.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.categorization.swt.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.categorization.swt;version="1.12.0"
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)"
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 12797be..f14af4e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 068ed3a..0921adc 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.11.0"
+Fragment-Host: org.eclipse.emf.ecp.view.compoundcontrol.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.compoundcontrol.swt;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)"
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 dd8156b..f1367c6 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 cd43a2c..a9670b1 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.11.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.context;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.context.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.context;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
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 9376496..4ff2e87 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 b057353..efd15ae 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.control.multireference;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.control.multireference;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.control.multireference.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.control.multireference;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 b12283f..5225210 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 75974d2..c8a9225 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.core.swt.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.core.swt.test.model;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.test.model.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.core.swt.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.internal.core.swt.renderer;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.core.swt.renderer;version="1.12.0"
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.swt.layout;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
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/build.properties b/tests/org.eclipse.emf.ecp.view.core.swt.tests/build.properties
index 337661f..0f1d475 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/build.properties
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/build.properties
@@ -14,7 +14,7 @@
bin.includes = .,\
model/,\
META-INF/,\
- plugin.xml,\
+ fragment.xml,\
plugin.properties
jars.compile.order = .
source.. = src/
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/plugin.xml b/tests/org.eclipse.emf.ecp.view.core.swt.tests/fragment.xml
similarity index 97%
rename from tests/org.eclipse.emf.ecp.view.core.swt.tests/plugin.xml
rename to tests/org.eclipse.emf.ecp.view.core.swt.tests/fragment.xml
index ddab2ae..c2dc47d 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/plugin.xml
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/fragment.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.4"?>
<!--
/*******************************************************************************
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 6901d60..0666a6b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/AbstractControl_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/AbstractControl_PTest.java
index 4b72d5d..572e324 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/AbstractControl_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/AbstractControl_PTest.java
@@ -62,10 +62,10 @@
public abstract class AbstractControl_PTest {
protected static final String CUSTOM_VARIANT = "org.eclipse.rap.rwt.customVariant"; //$NON-NLS-1$
- protected EMFFormsDatabinding databindingService;
- protected VTViewTemplateProvider templateProvider;
- protected AbstractControlSWTRenderer<VControl> renderer;
- protected EMFFormsLabelProvider labelProvider;
+ private EMFFormsDatabinding databindingService;
+ private VTViewTemplateProvider templateProvider;
+ private AbstractControlSWTRenderer<VControl> renderer;
+ private EMFFormsLabelProvider labelProvider;
private Resource createResource() {
final Resource.Factory.Registry registry = Resource.Factory.Registry.INSTANCE;
@@ -102,7 +102,7 @@
mockDatabindingIsUnsettable();
- Mockito.when(vControl.getDomainModelReference()).thenReturn(
+ Mockito.when(getvControl().getDomainModelReference()).thenReturn(
domainModelReference);
}
@@ -111,34 +111,34 @@
when(structuralFeature.isUnsettable()).thenReturn(false);
final IValueProperty valueProperty = mock(IValueProperty.class);
when(valueProperty.getValueType()).thenReturn(structuralFeature);
- when(databindingService.getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
valueProperty);
}
protected void setMockLabelAlignment(LabelAlignment labelAlignment) {
- Mockito.when(vControl.getLabelAlignment()).thenReturn(labelAlignment);
+ Mockito.when(getvControl().getLabelAlignment()).thenReturn(labelAlignment);
}
- protected ViewModelContext context;
- protected VControl vControl;
- protected Shell shell;
+ private ViewModelContext context;
+ private VControl vControl;
+ private Shell shell;
protected void setup() throws DatabindingFailedException {
- vControl = Mockito.mock(VControl.class);
+ setvControl(Mockito.mock(VControl.class));
mockControl();
- context = Mockito.mock(ViewModelContext.class);
- when(context.getDomainModel()).thenReturn(mock(EObject.class));
- shell = new Shell(Display.getDefault(), SWT.NONE);
+ setContext(Mockito.mock(ViewModelContext.class));
+ when(getContext().getDomainModel()).thenReturn(mock(EObject.class));
+ setShell(new Shell(Display.getDefault(), SWT.NONE));
}
protected void dispose() {
- shell.dispose();
+ getShell().dispose();
}
@Test
public void testGridDescriptionLabelAlignmentNone() {
setMockLabelAlignment(LabelAlignment.NONE);
- final SWTGridDescription gridDescription = renderer.getGridDescription(GridDescriptionFactory.INSTANCE
+ final SWTGridDescription gridDescription = getRenderer().getGridDescription(GridDescriptionFactory.INSTANCE
.createEmptyGridDescription());
assertEquals(2, gridDescription.getColumns());
assertEquals(1, gridDescription.getRows());
@@ -147,7 +147,7 @@
@Test
public void testGridDescriptionLabelAlignmentLeft() {
setMockLabelAlignment(LabelAlignment.LEFT);
- final SWTGridDescription gridDescription = renderer.getGridDescription(GridDescriptionFactory.INSTANCE
+ final SWTGridDescription gridDescription = getRenderer().getGridDescription(GridDescriptionFactory.INSTANCE
.createEmptyGridDescription());
assertEquals(3, gridDescription.getColumns());
assertEquals(1, gridDescription.getRows());
@@ -157,19 +157,19 @@
public void renderValidationIconLabelAlignmentNone()
throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
setMockLabelAlignment(LabelAlignment.NONE);
- renderValidationIcon(new SWTGridCell(0, 0, renderer));
+ renderValidationIcon(new SWTGridCell(0, 0, getRenderer()));
}
@Test
public void renderValidationIconLabelAlignmentLeft()
throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
setMockLabelAlignment(LabelAlignment.LEFT);
- renderValidationIcon(new SWTGridCell(0, 1, renderer));
+ renderValidationIcon(new SWTGridCell(0, 1, getRenderer()));
}
private void renderValidationIcon(SWTGridCell gridCell)
throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
- final Control render = renderer.render(gridCell, shell);
+ final Control render = getRenderer().render(gridCell, getShell());
assertTrue(Label.class.isInstance(render));
assertEquals("", Label.class.cast(render).getText());
}
@@ -177,7 +177,7 @@
protected void renderLabel(String text) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption {
setMockLabelAlignment(LabelAlignment.LEFT);
- final Control render = renderer.render(new SWTGridCell(0, 0, renderer), shell);
+ final Control render = getRenderer().render(new SWTGridCell(0, 0, getRenderer()), getShell());
assertTrue(Label.class.isInstance(render));
assertEquals(text, Label.class.cast(render).getText());
}
@@ -191,16 +191,16 @@
*/
protected void labelServiceUsage() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption,
NoLabelFoundException {
- reset(labelProvider);
+ reset(getLabelProvider());
final IObservableValue testDescription = Observables.constantObservableValue("test-description", String.class);
final IObservableValue testDisplayName = Observables.constantObservableValue("test-displayname", String.class);
- when(labelProvider.getDescription(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getLabelProvider().getDescription(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
testDescription);
- when(labelProvider.getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getLabelProvider().getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
testDisplayName);
setMockLabelAlignment(LabelAlignment.LEFT);
- final Control renderControl = renderControl(new SWTGridCell(0, 0, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 0, getRenderer()));
assertTrue(Label.class.isInstance(renderControl));
final Label label = (Label) renderControl;
@@ -210,13 +210,111 @@
protected Control renderControl(SWTGridCell gridCell)
throws NoRendererFoundException, NoPropertyDescriptorFoundExeption {
- final Control render = renderer.render(gridCell, shell);
+ final Control render = getRenderer().render(gridCell, getShell());
return render;
}
protected abstract void mockControl() throws DatabindingFailedException;
/**
+ * @return the context
+ */
+ public ViewModelContext getContext() {
+ return context;
+ }
+
+ /**
+ * @param context the context to set
+ */
+ public void setContext(ViewModelContext context) {
+ this.context = context;
+ }
+
+ /**
+ * @return the vControl
+ */
+ public VControl getvControl() {
+ return vControl;
+ }
+
+ /**
+ * @param vControl the vControl to set
+ */
+ public void setvControl(VControl vControl) {
+ this.vControl = vControl;
+ }
+
+ /**
+ * @return the shell
+ */
+ public Shell getShell() {
+ return shell;
+ }
+
+ /**
+ * @param shell the shell to set
+ */
+ public void setShell(Shell shell) {
+ this.shell = shell;
+ }
+
+ /**
+ * @return the databindingService
+ */
+ public EMFFormsDatabinding getDatabindingService() {
+ return databindingService;
+ }
+
+ /**
+ * @param databindingService the databindingService to set
+ */
+ public void setDatabindingService(EMFFormsDatabinding databindingService) {
+ this.databindingService = databindingService;
+ }
+
+ /**
+ * @return the templateProvider
+ */
+ public VTViewTemplateProvider getTemplateProvider() {
+ return templateProvider;
+ }
+
+ /**
+ * @param templateProvider the templateProvider to set
+ */
+ public void setTemplateProvider(VTViewTemplateProvider templateProvider) {
+ this.templateProvider = templateProvider;
+ }
+
+ /**
+ * @return the renderer
+ */
+ public AbstractControlSWTRenderer<VControl> getRenderer() {
+ return renderer;
+ }
+
+ /**
+ * @param renderer the renderer to set
+ */
+ public void setRenderer(AbstractControlSWTRenderer<VControl> renderer) {
+ this.renderer = renderer;
+ }
+
+ /**
+ * @return the labelProvider
+ */
+ public EMFFormsLabelProvider getLabelProvider() {
+ return labelProvider;
+ }
+
+ /**
+ * @param labelProvider the labelProvider to set
+ */
+ public void setLabelProvider(EMFFormsLabelProvider labelProvider) {
+ this.labelProvider = labelProvider;
+ }
+
+ /**
* Helper Interface for mocking.
*
* @author Eugen Neufeld
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlRenderer_PTest.java
index 56515e5..29f18cd 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/BooleanControlRenderer_PTest.java
@@ -53,13 +53,13 @@
public void before() throws DatabindingFailedException {
realm = new DefaultRealm();
final ReportService reportService = mock(ReportService.class);
- databindingService = mock(EMFFormsDatabinding.class);
- labelProvider = mock(EMFFormsLabelProvider.class);
- templateProvider = mock(VTViewTemplateProvider.class);
+ setDatabindingService(mock(EMFFormsDatabinding.class));
+ setLabelProvider(mock(EMFFormsLabelProvider.class));
+ setTemplateProvider(mock(VTViewTemplateProvider.class));
setup();
- renderer = new BooleanControlSWTRenderer(vControl, context, reportService, databindingService, labelProvider,
- templateProvider);
- renderer.init();
+ setRenderer(new BooleanControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+ getTemplateProvider()));
+ getRenderer().init();
}
@After
@@ -74,9 +74,9 @@
setMockLabelAlignment(LabelAlignment.NONE);
final TestObservableValue mockedObservableValue = mock(TestObservableValue.class);
when(mockedObservableValue.getRealm()).thenReturn(realm);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 1, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
assertControl(render);
}
@@ -86,9 +86,9 @@
setMockLabelAlignment(LabelAlignment.LEFT);
final TestObservableValue mockedObservableValue = mock(TestObservableValue.class);
when(mockedObservableValue.getRealm()).thenReturn(realm);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render);
}
@@ -156,13 +156,13 @@
*/
private Button setUpDatabindingTest(final ObservingWritableValue mockedObservable) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption, DatabindingFailedException {
- Mockito.reset(databindingService);
+ Mockito.reset(getDatabindingService());
mockDatabindingIsUnsettable();
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservable);
- final Control renderControl = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
final Button button = (Button) renderControl;
return button;
}
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlRenderer_PTest.java
index ae43686..34211cc 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/DateTimeControlRenderer_PTest.java
@@ -83,9 +83,9 @@
public void before() throws DatabindingFailedException {
realm = new DefaultRealm();
final ReportService reportService = mock(ReportService.class);
- databindingService = mock(EMFFormsDatabinding.class);
- labelProvider = mock(EMFFormsLabelProvider.class);
- templateProvider = mock(VTViewTemplateProvider.class);
+ setDatabindingService(mock(EMFFormsDatabinding.class));
+ setLabelProvider(mock(EMFFormsLabelProvider.class));
+ setTemplateProvider(mock(VTViewTemplateProvider.class));
final EMFFormsLocalizationService localizationService = mock(EMFFormsLocalizationService.class);
final ImageRegistryService imageRegistryService = mock(ImageRegistryService.class);
when(
@@ -114,9 +114,9 @@
.thenReturn(SELECTTIME);
setup();
- renderer = new DateTimeControlSWTRenderer(vControl, context, reportService, databindingService, labelProvider,
- templateProvider, localizationService, imageRegistryService);
- renderer.init();
+ setRenderer(new DateTimeControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+ getTemplateProvider(), localizationService, imageRegistryService));
+ getRenderer().init();
}
@After
@@ -135,9 +135,9 @@
when(mockedEObject.eIsSet(any(EStructuralFeature.class))).thenReturn(true);
when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 1, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
assertControl(render, true, true);
}
@@ -150,15 +150,15 @@
final EObject mockedEObject = mock(EObject.class);
when(mockedEObject.eIsSet(any(EStructuralFeature.class))).thenReturn(true);
when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render, true, true);
}
private void assertControl(Control render, boolean dateWidgetVisible, boolean timeWidgetVisible) {
// making the shell visible, so that the visibility of controls can be checked
- shell.setVisible(true);
+ getShell().setVisible(true);
assertTrue(Composite.class.isInstance(render));
final Composite top = Composite.class.cast(render);
assertEquals(2, top.getChildren().length);
@@ -321,10 +321,10 @@
private DateTime[] setUpDatabindingTest(final IObservableValue mockedObservable) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption, DatabindingFailedException {
mockDatabindingIsUnsettable();
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservable);
- final Control renderControl = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
final Composite composite = (Composite) renderControl;
final Composite stackComposite = (Composite) composite.getChildren()[0];
@@ -387,10 +387,10 @@
final EObject mockedEObject = mock(EObject.class);
when(mockedEObject.eIsSet(any(EStructuralFeature.class))).thenReturn(true);
when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render, true, true);
final Button setButton = getSetButton(render);
@@ -416,10 +416,10 @@
final EObject mockedEObject = mock(EObject.class);
when(mockedEObject.eIsSet(any(EStructuralFeature.class))).thenReturn(true);
when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render, true, false);
final Button setButton = getSetButton(render);
@@ -446,10 +446,10 @@
final EObject mockedEObject = mock(EObject.class);
when(mockedEObject.eIsSet(any(EStructuralFeature.class))).thenReturn(true);
when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render, false, true);
final Button setButton = getSetButton(render);
@@ -465,6 +465,6 @@
final VDateTimeDisplayAttachment displayAttachment = VViewFactory.eINSTANCE.createDateTimeDisplayAttachment();
displayAttachment.setDisplayType(displayType);
attachments.add(displayAttachment);
- Mockito.when(vControl.getAttachments()).thenReturn(attachments);
+ Mockito.when(getvControl().getAttachments()).thenReturn(attachments);
}
}
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerRenderer_PTest.java
index f3e9a40..2de0f5c 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/EnumComboViewerRenderer_PTest.java
@@ -59,15 +59,15 @@
public void before() throws DatabindingFailedException {
realm = new DefaultRealm();
final ReportService reportService = mock(ReportService.class);
- databindingService = mock(EMFFormsDatabinding.class);
- labelProvider = mock(EMFFormsLabelProvider.class);
- templateProvider = mock(VTViewTemplateProvider.class);
+ setDatabindingService(mock(EMFFormsDatabinding.class));
+ setLabelProvider(mock(EMFFormsLabelProvider.class));
+ setTemplateProvider(mock(VTViewTemplateProvider.class));
editSupport = mock(EMFFormsEditSupport.class);
setup();
- renderer = new EnumComboViewerSWTRenderer(vControl, context, reportService, databindingService, labelProvider,
- templateProvider, editSupport);
- renderer.init();
+ setRenderer(new EnumComboViewerSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+ getTemplateProvider(), editSupport));
+ getRenderer().init();
}
@After
@@ -159,12 +159,12 @@
private Combo setUpDatabindingTest(final ObservingWritableValue mockedObservable) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption, DatabindingFailedException {
mockDatabindingIsUnsettable();
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservable);
- when(databindingService.getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Properties.selfValue(mockedObservable.getValueType()));
- final Control renderControl = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
final Combo combo = (Combo) renderControl;
return combo;
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java
index 9e20bfa..706602d 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/NumberControlRenderer_PTest.java
@@ -63,9 +63,9 @@
public void before() throws DatabindingFailedException {
realm = new DefaultRealm();
final ReportService reportService = mock(ReportService.class);
- databindingService = mock(EMFFormsDatabinding.class);
- labelProvider = mock(EMFFormsLabelProvider.class);
- templateProvider = mock(VTViewTemplateProvider.class);
+ setDatabindingService(mock(EMFFormsDatabinding.class));
+ setLabelProvider(mock(EMFFormsLabelProvider.class));
+ setTemplateProvider(mock(VTViewTemplateProvider.class));
final EMFFormsLocalizationService localizationService = mock(EMFFormsLocalizationService.class);
when(
localizationService.getString(NumberControlSWTRenderer.class, MessageKeys.NumericalControl_FormatNumerical))
@@ -77,9 +77,9 @@
when(localeProvider.getLocale()).thenReturn(Locale.getDefault());
final EMFFormsEditSupport editSupport = mock(EMFFormsEditSupport.class);
setup();
- renderer = new NumberControlSWTRenderer(vControl, context, reportService, databindingService, labelProvider,
- templateProvider, editSupport, localizationService, localeProvider);
- renderer.init();
+ setRenderer(new NumberControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+ getTemplateProvider(), editSupport, localizationService, localeProvider));
+ getRenderer().init();
}
@After
@@ -104,11 +104,11 @@
when(mockedEClassifier.getInstanceClass()).thenReturn(clazz);
when(mockedEStructuralFeature.getEType()).thenReturn(mockedEClassifier);
when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- when(databindingService.getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Properties.selfValue(mockedEStructuralFeature));
- final Control render = renderControl(new SWTGridCell(0, 1, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
assertControl(render);
}
@@ -128,12 +128,12 @@
when(mockedEClassifier.getInstanceClass()).thenReturn(clazz);
when(mockedEStructuralFeature.getEType()).thenReturn(mockedEClassifier);
when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- when(databindingService.getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Properties.selfValue(mockedEStructuralFeature));
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render);
}
@@ -230,12 +230,12 @@
private Text setUpDatabindingTest(final ObservingWritableValue mockedObservable) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption, DatabindingFailedException {
mockDatabindingIsUnsettable();
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservable, new ObservingWritableValue(mockedObservable));
- when(databindingService.getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Properties.selfValue(mockedObservable.getValueType()));
- final Control renderControl = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
final Text text = (Text) Composite.class.cast(renderControl).getChildren()[0];
return text;
}
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java
index 4595327..d770e94 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/internal/core/swt/renderer/XMLDateControlRenderer_PTest.java
@@ -69,9 +69,9 @@
public void before() throws DatabindingFailedException {
realm = new DefaultRealm();
final ReportService reportService = mock(ReportService.class);
- databindingService = mock(EMFFormsDatabinding.class);
- labelProvider = mock(EMFFormsLabelProvider.class);
- templateProvider = mock(VTViewTemplateProvider.class);
+ setDatabindingService(mock(EMFFormsDatabinding.class));
+ setLabelProvider(mock(EMFFormsLabelProvider.class));
+ setTemplateProvider(mock(VTViewTemplateProvider.class));
final EMFFormsEditSupport editSupport = mock(EMFFormsEditSupport.class);
final EMFFormsLocalizationService localizationService = mock(EMFFormsLocalizationService.class);
final EMFFormsLocaleProvider localeProvider = mock(EMFFormsLocaleProvider.class);
@@ -79,9 +79,9 @@
final ImageRegistryService imageRegistryService = mock(ImageRegistryService.class);
setup();
- renderer = new XMLDateControlSWTRenderer(vControl, context, reportService, databindingService, labelProvider,
- templateProvider, editSupport, localizationService, localeProvider, imageRegistryService);
- renderer.init();
+ setRenderer(new XMLDateControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+ getTemplateProvider(), editSupport, localizationService, localeProvider, imageRegistryService));
+ getRenderer().init();
}
@After
@@ -102,9 +102,9 @@
final EStructuralFeature mockedEStructuralFeature = mock(EStructuralFeature.class);
when(mockedEStructuralFeature.isUnsettable()).thenReturn(false);
when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 1, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
assertControl(render);
}
@@ -120,9 +120,9 @@
final EStructuralFeature mockedEStructuralFeature = mock(EStructuralFeature.class);
when(mockedEStructuralFeature.isUnsettable()).thenReturn(false);
when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render);
}
@@ -219,14 +219,14 @@
*/
private Text setUpDatabindingTest(final ObservingWritableValue mockedObservable) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption, DatabindingFailedException {
- Mockito.reset(databindingService);
+ Mockito.reset(getDatabindingService());
mockDatabindingIsUnsettable();
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservable, new ObservingWritableValue(mockedObservable));
- when(databindingService.getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getValueProperty(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Properties.selfValue(mockedObservable.getValueType()));
- final Control renderControl = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
final Composite composite = (Composite) renderControl;
final Text text = (Text) Composite.class.cast(composite.getChildren()[0]).getChildren()[0];
return text;
diff --git a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java
index 4e67736..4422f32 100644
--- a/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.core.swt.tests/src/org/eclipse/emf/ecp/view/spi/core/swt/renderer/TextControlRenderer_PTest.java
@@ -57,14 +57,14 @@
public void before() throws DatabindingFailedException {
realm = new DefaultRealm();
final ReportService reportService = mock(ReportService.class);
- databindingService = mock(EMFFormsDatabinding.class);
- labelProvider = mock(EMFFormsLabelProvider.class);
- templateProvider = mock(VTViewTemplateProvider.class);
+ setDatabindingService(mock(EMFFormsDatabinding.class));
+ setLabelProvider(mock(EMFFormsLabelProvider.class));
+ setTemplateProvider(mock(VTViewTemplateProvider.class));
final EMFFormsEditSupport editSupport = mock(EMFFormsEditSupport.class);
setup();
- renderer = new TextControlSWTRenderer(vControl, context, reportService, databindingService, labelProvider,
- templateProvider, editSupport);
- renderer.init();
+ setRenderer(new TextControlSWTRenderer(getvControl(), getContext(), reportService, getDatabindingService(), getLabelProvider(),
+ getTemplateProvider(), editSupport));
+ getRenderer().init();
}
@After
@@ -77,7 +77,7 @@
public void renderControlLabelAlignmentNone()
throws NoRendererFoundException, NoPropertyDescriptorFoundExeption, DatabindingFailedException,
NoLabelFoundException {
- when(labelProvider.getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getLabelProvider().getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Observables.constantObservableValue("antiException", String.class));
setMockLabelAlignment(LabelAlignment.NONE);
final TestObservableValue mockedObservableValue = mock(TestObservableValue.class);
@@ -87,9 +87,9 @@
when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
final EStructuralFeature mockedEStructuralFeature = EcorePackage.eINSTANCE.getENamedElement_Name();
when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 1, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 1, getRenderer()));
assertControl(render);
}
@@ -97,7 +97,7 @@
public void renderControlLabelAlignmentLeft()
throws NoRendererFoundException, NoPropertyDescriptorFoundExeption, DatabindingFailedException,
NoLabelFoundException {
- when(labelProvider.getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getLabelProvider().getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Observables.constantObservableValue("antiException", String.class));
setMockLabelAlignment(LabelAlignment.LEFT);
final TestObservableValue mockedObservableValue = mock(TestObservableValue.class);
@@ -108,9 +108,9 @@
final EStructuralFeature mockedEStructuralFeature = mock(EStructuralFeature.class);
when(mockedEStructuralFeature.isUnsettable()).thenReturn(false);
when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control render = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control render = renderControl(new SWTGridCell(0, 2, getRenderer()));
assertControl(render);
}
@@ -199,14 +199,14 @@
*/
private Text setUpDatabindingTest(final ObservingWritableValue mockedObservable) throws NoRendererFoundException,
NoPropertyDescriptorFoundExeption, DatabindingFailedException, NoLabelFoundException {
- when(labelProvider.getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getLabelProvider().getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
Observables.constantObservableValue("antiException"));
- Mockito.reset(databindingService);
+ Mockito.reset(getDatabindingService());
mockDatabindingIsUnsettable();
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservable, new ObservingWritableValue(mockedObservable));
- final Control renderControl = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
final Text text = (Text) Composite.class.cast(renderControl).getChildren()[0];
return text;
}
@@ -224,7 +224,7 @@
public void testLabelServiceUsageTextField() throws NoRendererFoundException, NoPropertyDescriptorFoundExeption,
DatabindingFailedException, NoLabelFoundException {
final IObservableValue testDisplayName = Observables.constantObservableValue("test-displayname", String.class);
- when(labelProvider.getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getLabelProvider().getDisplayName(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
testDisplayName);
setMockLabelAlignment(LabelAlignment.LEFT);
@@ -236,10 +236,10 @@
when(mockedObservableValue.getObserved()).thenReturn(mockedEObject);
final EStructuralFeature mockedEStructuralFeature = EcorePackage.eINSTANCE.getENamedElement_Name();
when(mockedObservableValue.getValueType()).thenReturn(mockedEStructuralFeature);
- when(databindingService.getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
+ when(getDatabindingService().getObservableValue(any(VDomainModelReference.class), any(EObject.class))).thenReturn(
mockedObservableValue);
- final Control renderControl = renderControl(new SWTGridCell(0, 2, renderer));
+ final Control renderControl = renderControl(new SWTGridCell(0, 2, getRenderer()));
final Control textRender = Composite.class.cast(renderControl).getChildren()[0];
assertTrue(Text.class.isInstance(textRender));
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 966a80a..45ca844 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.custom.ui.swt.test;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.validation;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding.property;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.index;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 4a97c65..074c199 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/CustomControlStub2.java b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/CustomControlStub2.java
index 6439c95..9412b73 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/CustomControlStub2.java
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/CustomControlStub2.java
@@ -42,7 +42,7 @@
private static Composite parent;
private final Set<VDomainModelReference> features = new LinkedHashSet<VDomainModelReference>();
- public static VDomainModelReference resolvedDomainModelReference;
+ private static VDomainModelReference resolvedDomainModelReference;
public CustomControlStub2() {
super();
@@ -92,8 +92,7 @@
setLabel(new Label(parent, SWT.NONE));
return label;
- }
- else if (cell.getColumn() == 1) {
+ } else if (cell.getColumn() == 1) {
resolvedDomainModelReference = getResolvedDomainModelReference(BowlingPackage.eINSTANCE
.getMerchandise_Name());
final Composite createControl = getControl(SWTControl.class, resolvedDomainModelReference).createControl(
diff --git a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/ValidationCustomControl.java b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/ValidationCustomControl.java
index a1777eb..2091195 100644
--- a/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/ValidationCustomControl.java
+++ b/tests/org.eclipse.emf.ecp.view.custom.ui.swt.test/src/org/eclipse/emf/ecp/view/custom/ui/swt/test/ValidationCustomControl.java
@@ -38,7 +38,7 @@
private final Set<VDomainModelReference> features = new LinkedHashSet<VDomainModelReference>();
/**
- * @param features
+ * Default constructor.
*/
public ValidationCustomControl() {
super();
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 adb025a..5c1e0e1 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.11.0.qualifier"
+ version="1.12.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.11.0.qualifier">
+ license-feature-version="1.12.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 9aca860..1ece400 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2d015a3..75f2cd4 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.provider;version="1.12.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.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.categorization.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
org.eclipse.emf.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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
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 396cb7b..dff3b28 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c1cc8af..fdb5e80 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0";
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model.test;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)"
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 c4ac47f..bf8ca14 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/src/org/eclipse/emf/ecp/view/dynamictree/model/test/DynamicContainmentTree_PTest.java b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/src/org/eclipse/emf/ecp/view/dynamictree/model/test/DynamicContainmentTree_PTest.java
index 764546a..0be25f7 100644
--- a/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/src/org/eclipse/emf/ecp/view/dynamictree/model/test/DynamicContainmentTree_PTest.java
+++ b/tests/org.eclipse.emf.ecp.view.dynamictree.model.test/src/org/eclipse/emf/ecp/view/dynamictree/model/test/DynamicContainmentTree_PTest.java
@@ -15,7 +15,6 @@
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
-import java.util.List;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.ecore.EObject;
@@ -32,8 +31,6 @@
import org.eclipse.emf.ecp.view.dynamictree.model.ModelPackage;
import org.eclipse.emf.ecp.view.dynamictree.model.TestElement;
import org.eclipse.emf.ecp.view.dynamictree.model.TestElementContainer;
-import org.eclipse.emf.ecp.view.spi.categorization.model.VAction;
-import org.eclipse.emf.ecp.view.spi.context.ViewModelContext;
import org.eclipse.emf.ecp.view.spi.context.ViewModelContextFactory;
import org.eclipse.emf.ecp.view.spi.model.VContainedElement;
import org.eclipse.emf.ecp.view.spi.model.VControl;
@@ -95,7 +92,7 @@
viewControl.setDomainModelReference(createFeaturePathDomainModelReference);
tree.setComposite(viewControl);
- final ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE.createViewModelContext(tree, root);
+ ViewModelContextFactory.INSTANCE.createViewModelContext(tree, root);
}
@After
@@ -260,7 +257,6 @@
VElement renderable = null;
DynamicContainmentTree tree = null;
- List<VAction> actions = null;
if (!TestElementContainer.class.isInstance(virtualParent)) {
virtualParent = virtualParent.eContainer();
@@ -276,7 +272,7 @@
if (tree == null) {
tree = (DynamicContainmentTree) viewModelParent;
}
- actions = tree.getActions();
+ tree.getActions();
renderable = tree.getChildComposite();
final DynamicContainmentItem pi = ModelFactory.eINSTANCE.createDynamicContainmentItem();
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 6ce9e7e..c0f21e0 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.11.0",
- org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.dynamictree.model.util;version="1.12.0"
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.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)";visibility:=reexport,
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)";visibility:=reexport,
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Service-Component: OSGI-INF/dynamicContainmentTreeDMRConverter.xml
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml b/tests/org.eclipse.emf.ecp.view.dynamictree.model/pom.xml
index ba78f0a..b43ec5e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a4d329e..bd8e49c 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui.swt;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.spi.core.services.databinding;version="[1.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.spi.core.services.databinding;version="[1.12.0,1.13.0)",
org.eclipse.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 b1165a0..09757cf 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0d2d36d..9a98c4a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.dynamictree.ui;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.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 5454396..4cb5b35 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 bd056cd..6697a7d 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.ecp.view.edapt.test/META-INF/MANIFEST.MF
@@ -2,28 +2,28 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.view.edapt.test;singleton:=true
-Bundle-Version: 1.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._140to170;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test._160to170;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._140to170;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test._160to170;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.test.model.util;version="1.12.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml b/tests/org.eclipse.emf.ecp.view.edapt.test/pom.xml
index 8fa099f..a4b5ac8 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 97d5465..6e684e4 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.edapt;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.11.0",
- org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.edapt;version="1.12.0",
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.a.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.b.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.c.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.d.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.e.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.f.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.w.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.x.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.y.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.edapt.util.test.model.z.util;version="1.12.0";x-internal:=true
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/build.properties b/tests/org.eclipse.emf.ecp.view.edapt.util.test/build.properties
index 4465407..35c6807 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/build.properties
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/build.properties
@@ -3,8 +3,8 @@
bin.includes = .,\
model/,\
META-INF/,\
- plugin.xml,\
- plugin.properties
+ plugin.properties,\
+ fragment.xml
jars.compile.order = .
source.. = src/
output.. = bin/
diff --git a/tests/org.eclipse.emf.ecp.view.edapt.util.test/plugin.xml b/tests/org.eclipse.emf.ecp.view.edapt.util.test/fragment.xml
similarity index 98%
rename from tests/org.eclipse.emf.ecp.view.edapt.util.test/plugin.xml
rename to tests/org.eclipse.emf.ecp.view.edapt.util.test/fragment.xml
index 5c073e6..cd3ff1c 100644
--- a/tests/org.eclipse.emf.ecp.view.edapt.util.test/plugin.xml
+++ b/tests/org.eclipse.emf.ecp.view.edapt.util.test/fragment.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
+<?eclipse version="3.4"?>
<!--
-->
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 66a5f08..8246865 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1cdff5f..a463c6d 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.group.ui.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.group.ui.swt.test;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
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 dea25f2..af74e90 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8546b9d..c2cbc58 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.horizontal.ui.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.horizontal.ui.swt.test;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
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 c928c91..843fca9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0f37d92..b86d611 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.index.test.example.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.index.test.example;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.index.test.example.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.indexdmr.model.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.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 7ed4682..7fa602b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 87abb8f..8542032 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.11.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.11.0",
- org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.keyattribute.test.example;version="1.12.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.keyattribute.test.example.util;version="1.12.0",
+ org.eclipse.emf.ecp.view.keyattributedmr.model.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.keyattributedmr.model;bundle-version="[1.12.0,1.13.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 74e5613..98937fd 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 e382389..d463b6f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.mapping.test.example;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mapping.test.example.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.mappingdmr.model.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.mappingdmr.model;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml b/tests/org.eclipse.emf.ecp.view.mappingdmr.model.test/pom.xml
index 4e5b696..ada9f23 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 450e479..cd26987 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.11.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.common;version="1.12.0"
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.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 62bb839..fdf7c4b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8b16684..30d0a97 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.edit.test;version="1.12.0";x-internal:=true
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 d2b8f5b..e7ff7ea 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4c88677..901eecc 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.11.0.qualifier">
+ version="1.12.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 65cfa4d..c4598ec 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 994a0ae..6c20f8a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)"
+Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.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 a23464f..8842f98 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 fc43377..cb29615 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.11.0.qualifier
-Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Export-Package: org.eclipse.emf.ecp.view.model.integrationtest;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.group.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.section.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.groupedgrid.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.group.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.horizontal.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.stack.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.section.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.compoundcontrol.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.custom.model;bundle-version="[1.12.0,1.13.0)"
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 4098105..b6cc82a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 238f362..4615b19 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.provider.xmi;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.model.provider.xmi.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.makeithappen.model;bundle-version="[1.12.0,1.13.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 1aea44d..d3e2a7e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 aa3fa14..951abe4 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.spi.model;version="1.11.0"
+Fragment-Host: org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.model.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.spi.model;version="1.12.0"
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 0fa5979..0c61feb 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.11.0-SNAPSHOT</version>
+ <version>1.12.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 cd63315..d577a45 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.rule.test;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.indexdmr.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
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 ef8fe07..95631cb 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.rule.ui.swt.test/META-INF/MANIFEST.MF
index 0d798fa..8e6b079 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.rule;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.rule.ui.swt.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)"
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 6a9765f..5f03f97 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 df44120..966d9d2 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.stack.ui.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.stack.ui.swt.test;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.0)"
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 1a9456b..ed83c9c 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 00c8ab0..f04866a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.11.0",
- org.eclipse.emf.ecp.view.table.model.test;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.spi.table.model.util;version="1.12.0",
+ org.eclipse.emf.ecp.view.table.model.test;version="1.12.0";x-internal:=true
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 8b476aa..88ac889 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.view.table.ui.swt.test/META-INF/MANIFEST.MF
index e75492b..6f49f6c 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.11.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emf.ecp.view.table.ui.swt.test;version="1.12.0";x-friends:="org.eclipse.emf.ecp.view.ui.editor.test"
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.columnservice;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.emf;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.util.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.editsupport;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.edit.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.common.report;version="[1.12.0,1.13.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 68394b4..3f79b71 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
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 9974da4..e6f4169 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.11.0,1.12.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.template.service;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.template.service;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.label.model;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.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 3e8e267..481f24f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4fe36dd..770a4e0 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.swt;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.test.common.swt.spi;version="1.12.0"
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)";visibility:=reexport
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)";visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework
+Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml b/tests/org.eclipse.emf.ecp.view.test.common.swt/pom.xml
index ef52f2a..c1a8703 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
</project>
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/DatabindingClassRunner.java b/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/DatabindingClassRunner.java
index 9effcfa..e26ed49 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/DatabindingClassRunner.java
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/DatabindingClassRunner.java
@@ -28,8 +28,10 @@
public class DatabindingClassRunner extends BlockJUnit4ClassRunner {
/**
- * @param klass
- * @throws InitializationError
+ * Creates a DatabindingClassRunner providing a {@link Realm} to run {@code klass}.
+ *
+ * @param klass the test class to be executed
+ * @throws InitializationError if the test class is malformed.
*/
public DatabindingClassRunner(Class<?> klass) throws InitializationError {
super(klass);
diff --git a/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/SWTViewTestHelper.java b/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/SWTViewTestHelper.java
index 7bc41b4..757c7d2 100644
--- a/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/SWTViewTestHelper.java
+++ b/tests/org.eclipse.emf.ecp.view.test.common.swt/src/org/eclipse/emf/ecp/view/test/common/swt/spi/SWTViewTestHelper.java
@@ -38,6 +38,12 @@
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
+/**
+ * Helper Class for SWT Tests.
+ *
+ * @author Jonas Helming
+ *
+ */
public final class SWTViewTestHelper {
// private static SWTRendererFactory factory = new SWTRendererFactoryImpl();
private static EMFFormsRendererFactory factory;
@@ -109,16 +115,32 @@
return render(renderable, VViewFactory.eINSTANCE.createView(), shell);
}
+ /**
+ *
+ * @param composite a {@link Composite} with a {@link GridLayout}
+ * @return the number of columns
+ */
public static int getNumberofColumns(Composite composite) {
final GridLayout gridLayout = (GridLayout) composite.getLayout();
return gridLayout.numColumns;
}
- public static int getHorizontalSpan(Composite composite) {
- final GridData gridData = (GridData) composite.getLayoutData();
+ /**
+ *
+ * @param control a control with a Horitontal Span specified
+ * @return the horizontal span
+ */
+ public static int getHorizontalSpan(Control control) {
+ final GridData gridData = (GridData) control.getLayoutData();
return gridData.horizontalSpan;
}
+ /**
+ * Checks whether there is a text control.
+ *
+ * @param control the control to check its children
+ * @return if there is a text control
+ */
public static boolean checkIfThereIsATextControlWithLabel(Control control) {
if (!(control instanceof Composite)) {
return false;
@@ -128,6 +150,13 @@
return checkIfThereIsATextControl(controlComposite.getChildren()[2]);
}
+ /**
+ * Checks whether there is at least one text control in the children of a control (recursivly). The method will only
+ * check the first child on every level.
+ *
+ * @param control control the control to check its children
+ * @return if there is a text control
+ */
public static boolean checkIfThereIsATextControl(Control control) {
if (Text.class.isInstance(control)) {
return true;
@@ -137,6 +166,12 @@
return false;
}
+ /**
+ * Retrieve all text controls, which are children on a given control.
+ *
+ * @param control the control to check its children
+ * @return a {@link List} of {@link Text}
+ */
public static List<Text> getAllTextControls(Control control) {
final Composite controlComposite = (Composite) control;
final List<Text> textFields = new ArrayList<Text>();
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 f36f78d..c3ef0d4 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.test.common.spi;version="1.12.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 de0df0c..e3f357e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 f77d8d4..35e42b0 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt.test;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.treemasterdetail.model;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)"
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 c79e40a..d69572d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 6bda1b8..512a173 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.treemasterdetail.ui.swt;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.treemasterdetail.validation.test;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.treemasterdetail.validation.test.TestTMD.util;version="1.12.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
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 41e4a28..65bdf2b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 084aaf8..eb03453 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.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.11.0";x-internal:=true
+Export-Package: org.eclipse.emf.ecp.view.ui.editor.test;version="1.12.0";uses:="org.eclipse.emf.emfstore.bowling,org.eclipse.swtbot.swt.finder,org.osgi.framework",
+ org.eclipse.emf.ecp.view.ui.editor.test.controls;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.12.0,1.13.0)",
org.eclipse.ui;bundle-version="3.105.0",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.dynamictree.model.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.edit;bundle-version="[2.8.0,3.0.0)",
- org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.ui.swt.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.view.model.localization;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.table.ui.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.ui.swt.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
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 e52e97d..f0a6110 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 71c07df..08f3e0d 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.unset.test;version="1.12.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.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.unset;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.unset;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.categorization.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.rule.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
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 f6c4271..b4e3280 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7564670..c39892a 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.11.0.qualifier
+Bundle-Version: 1.12.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.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation.bean.default;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: car;version="1.11.0";x-internal:=true,
- car.impl;version="1.11.0";x-internal:=true,
- car.util;version="1.11.0";x-internal:=true,
- org.eclipse.emf.ecp.view.validation.bean.test;version="1.11.0";x-internal:=true
+Export-Package: car;version="1.12.0";x-internal:=true,
+ car.impl;version="1.12.0";x-internal:=true,
+ car.util;version="1.12.0";x-internal:=true,
+ org.eclipse.emf.ecp.view.validation.bean.test;version="1.12.0";x-internal:=true
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 75dbfee..b880a56 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 002a648..10eb0ae 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.11.0,1.12.0)"
+Fragment-Host: org.eclipse.emf.ecp.view.validation;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: plugin
-Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.11.0",
- org.eclipse.emf.ecp.view.validation.test.model;version="1.11.0",
- org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.11.0",
- org.eclipse.emf.ecp.view.validation.test.model.util;version="1.11.0"
+Export-Package: org.eclipse.emf.ecp.view.validation.test;version="1.12.0",
+ org.eclipse.emf.ecp.view.validation.test.model;version="1.12.0",
+ org.eclipse.emf.ecp.view.validation.test.model.impl;version="1.12.0",
+ org.eclipse.emf.ecp.view.validation.test.model.util;version="1.12.0"
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.table.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.table.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.provider.xmi;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.mappingprovider.table;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.table;bundle-version="[1.12.0,1.13.0)"
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 eb3ba32..eb54516 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 2edfd49..86587d1 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.11.0,1.12.0)",
+Fragment-Host: org.eclipse.emf.ecp.view.vertical.ui.swt;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.vertical.ui.swt.test;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.ecp.view.test.common.swt;bundle-version="[1.12.0,1.13.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
org.eclipse.swt;bundle-version="[3.1.0,4.0.0)",
- org.eclipse.emf.ecp.edit;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.edit;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.test;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.jface;bundle-version="3.8.102",
- org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.structuralchange.default;bundle-version="[1.12.0,1.13.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 f18f2f4..1e0da10 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 db2730b..2040082 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.11.0.qualifier
-Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.11.0",
- org.eclipse.emf.ecp.view.viewproxy.tests;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emf.ecp.view.viewproxy.model;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emf.ecp.view.internal.viewproxy.resolver;version="1.12.0",
+ org.eclipse.emf.ecp.view.viewproxy.tests;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.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 122945e..f63a7a9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 50eeba1..78207a9 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.common.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.common.locale;version="1.11.0"
+Fragment-Host: org.eclipse.emfforms.common;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.common.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.common.locale;version="1.12.0"
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 bceffef..b1fdf9b 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 bda5a71..8d5a239 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.featurepath;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.featurepath.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.featurepath;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.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 b852ba3..4cac220 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c173782..6b7d171 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.index;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.index;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.index.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.index;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.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 0f4cb41..53a44bc 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ac81070..1adf1c6 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.integrationtest;version="1.12.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
org.eclipse.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 57b4f89..b24bbb4 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 af7504b..f410848 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.keyattribute;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.keyattribute.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.keyattribute;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
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 bb77036..3f15177 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 d67c737..78fb8bd 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.databinding.mapping;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.databinding.mapping.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding.mapping;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)"
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 1df9e55..fef9e91 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 eb9c4f8..53315f9 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.11.0",
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.11.0";x-internal:=true
+Export-Package: org.eclipse.emfforms.core.services.databinding.testmodel.test.model;version="1.12.0",
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.impl;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.core.services.databinding.testmodel.test.model.util;version="1.12.0";x-internal:=true
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 681d09b..913a8c7 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 8871843..83c7bef 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.default;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.defaultheuristic.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.defaultheuristic;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.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 0543a9c..cb29ac9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 ba00f30..0a3507d 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.index;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.index.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.index;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
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 067bb58..67b01a9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 c0863b9..a892f9a 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.keyattribute;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.keyattribute.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.keyattribute;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)"
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 8b19848..1c047b2 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 f06c7dd..ae3a7fd 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.domainexpander.mapping;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.domainexpander.mapping.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.domainexpander.mapping;version="1.12.0";x-internal:=true
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.11.0,1.12.0)"
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.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 daa3ff2..dc0b35e 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emfforms.core.services.emf.tests/AllIntegrationTests core.services.emf.launch b/tests/org.eclipse.emfforms.core.services.emf.tests/AllIntegrationTests core.services.emf.launch
index 1b37874..f9e4f70 100644
--- a/tests/org.eclipse.emfforms.core.services.emf.tests/AllIntegrationTests core.services.emf.launch
+++ b/tests/org.eclipse.emfforms.core.services.emf.tests/AllIntegrationTests core.services.emf.launch
@@ -104,7 +104,6 @@
<setEntry value="org.eclipse.emf.ecp.graphiti.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.license.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.makeithappen.feature:default"/>
-<setEntry value="org.eclipse.emf.ecp.nosite.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.rap.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.rap.sdk.feature:default"/>
<setEntry value="org.eclipse.emf.ecp.rap.util.feature:default"/>
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 e46cb1b..4289811 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.databinding;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.label;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.core.services.emf;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.emf.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.databinding;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.label;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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 3b723b4..6a0091f 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 7f6e77d..dc43113 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.legacy;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.legacy;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.legacy.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.legacy;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+Import-Package: org.eclipse.emfforms.common;version="[1.12.0,1.13.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 b160f0b..a875bab 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 1fc1456..6712bed 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services.structuralchange.keyattribute;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.structuralchange.keyattribute;version="1.12.0";x-internal:=true
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.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.common;bundle-version="[2.11.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml b/tests/org.eclipse.emfforms.core.services.structuralchange.keyattribute.tests/pom.xml
index dff3157..36170ea 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 a6a4ea0..0aedae9 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.internal.core.services.scoped;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.core.services.tests;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.core.services.scoped;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.core.services.tests;version="1.12.0";x-internal:=true
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 0068450..0d37e59 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 42e1012..84c2731 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.spi.localization;version="1.11.0"
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.localization;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.localization.tests;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.spi.localization;version="1.12.0"
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 82b3a56..de005d1 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4a514fd..ff93be5 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.11.0";x-internal:=true
+Fragment-Host: org.eclipse.emfforms.swt.control.text.autocomplete;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.control.text.autocomplete.renderer;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.swt.control.text.autocomplete.tests;version="1.12.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emfforms.core.services.databinding.testmodel;bundle-version="[1.12.0,1.13.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.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 13f4ecd..eca616d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 0b94ac7..6f09083 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.11.0"
+Fragment-Host: org.eclipse.emfforms.swt.controlgrid;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.spi.swt.controlgrid.renderer;version="1.12.0"
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.11.0,1.12.0)"
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.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 c87c177..aea99a9 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 9dc650e..102a35f 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.11.0";x-internal:=true
-Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.model.common;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.context;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.test.common;bundle-version="[1.11.0,1.12.0)",
+Fragment-Host: org.eclipse.emfforms.swt.core.di.extension;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.extension;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.internal.swt.core.di.extension.tests;version="1.12.0";x-internal:=true
+Require-Bundle: org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.swt.core.di.tests;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.model.common;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.context;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
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 40999ea..be4d093 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 bc753fb..a0c6ec0 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.11.0.qualifier
+Bundle-Version: 1.12.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.11.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
- org.eclipse.emfforms.spi.swt.core.di;version="1.11.0"
-Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emfforms.core.services;bundle-version="[1.11.0,1.12.0)",
+Export-Package: org.eclipse.emfforms.internal.swt.core.di.tests;version="1.12.0";x-friends:="org.eclipse.emfforms.swt.core.di.extension.tests",
+ org.eclipse.emfforms.spi.swt.core.di;version="1.12.0"
+Require-Bundle: org.eclipse.emfforms.swt.core.di;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emfforms.core.services;bundle-version="[1.12.0,1.13.0)",
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.test.common;bundle-version="[1.12.0,1.13.0)",
org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.emf.ecp.ui.view;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.view.template.model;bundle-version="[1.11.0,1.12.0)",
- org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.11.0,1.12.0)",
+ org.eclipse.emf.ecp.ui.view;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.view.template.model;bundle-version="[1.12.0,1.13.0)",
+ org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.12.0,1.13.0)",
org.eclipse.emf.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.11.0,1.12.0)",
+ org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.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 a96f0b0..f16e95d 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 4db9628..69c8cc3 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.11.0,1.12.0)"
-Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.swt.core.tests;version="1.11.0";x-internal:=true
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.swt.core;bundle-version="[1.12.0,1.13.0)"
+Export-Package: org.eclipse.emfforms.internal.swt.core;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.swt.core.tests;version="1.12.0";x-internal:=true
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 0c2cc04..c0b9b6a 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.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 3fae967..56d7baf 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.11.0.qualifier
-Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.11.0,1.12.0)"
+Bundle-Version: 1.12.0.qualifier
+Fragment-Host: org.eclipse.emfforms.view.model.localization;bundle-version="[1.12.0,1.13.0)"
Bundle-Localization: OSGI-INF/l10n/bundle
-Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.11.0";x-internal:=true,
- org.eclipse.emfforms.view.model.localization.tests;version="1.11.0"
+Export-Package: org.eclipse.emfforms.internal.view.model.localization;version="1.12.0";x-internal:=true,
+ org.eclipse.emfforms.view.model.localization.tests;version="1.12.0"
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.11.0,1.12.0)",
+ org.eclipse.emf.ecp.view.vertical.model;bundle-version="[1.12.0,1.13.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.11.0,1.12.0)"
+Import-Package: org.eclipse.emfforms.spi.localization;version="[1.12.0,1.13.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 3c0282d..f56bb77 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.11.0-SNAPSHOT</version>
+ <version>1.12.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.11.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
