[412185] Automatic saving of project/repo properties does not work
https://bugs.eclipse.org/bugs/show_bug.cgi?id=412185
diff --git a/bundles/org.eclipse.emf.ecp.application.e3/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.application.e3/.settings/org.eclipse.core.resources.prefs
index 64c60c3..b66fd58 100644
--- a/bundles/org.eclipse.emf.ecp.application.e3/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.application.e3/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.application.e3/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.application.e3/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.application.e3/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.application.e3/META-INF/MANIFEST.MF
index 9b9a84c..5cce786 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Demo Application Eclipse 3.x
Bundle-SymbolicName: org.eclipse.emf.ecp.application.e3;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.application3x.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.ui.e3;bundle-version="[1.0.0,2.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 1e58b9f..bc9bc52 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.application.e3</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.cdo.core/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.core/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.cdo.core/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.cdo.core/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.core/META-INF/MANIFEST.MF
index 61c5106..cab0f38 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP CDO Model Repository Core
Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.cdo.internal.core.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -12,7 +12,7 @@
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)",
org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2;version="[1.0.0.qualifier,2.0.0)",
- org.h2.jdbcx;version="[1.0.0.qualifier,2.0.0)"
+Import-Package: org.h2;version="[1.0.1.qualifier,2.0.0)",
+ org.h2.jdbcx;version="[1.0.1.qualifier,2.0.0)"
Export-Package: org.eclipse.emf.ecp.cdo.internal.core;version="1.0.0";x-friends:="org.eclipse.emf.ecp.cdo.ui"
Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.core/pom.xml
index 5d2f6fe..860411f 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.cdo.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.cdo.ui/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.cdo.ui/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.cdo.ui/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.cdo.ui/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.cdo.ui/META-INF/MANIFEST.MF
index 9c11e03..521b911 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CDO Model Repository ECP UI
Bundle-SymbolicName: org.eclipse.emf.ecp.cdo.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.cdo.internal.ui.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.cdo.core;bundle-version="[1.0.0,2.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml b/bundles/org.eclipse.emf.ecp.cdo.ui/pom.xml
index 8aae00c..0106aea 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.cdo.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.core.resources.prefs
index dbe729d..bb4cf3c 100644
--- a/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
eclipse.preferences.version=1
encoding//src/org/eclipse/emf/ecp/common/cachetree/AbstractCachedTree.java=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.common/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
index 532fff8..f4ae69b 100644
--- a/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Common
Bundle-SymbolicName: org.eclipse.emf.ecp.common
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.8.1,3.0.0)"
Export-Package: org.eclipse.emf.ecp.common.cachetree;version="1.0.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.ecp.common/pom.xml b/bundles/org.eclipse.emf.ecp.common/pom.xml
index 12f18d7..729ea76 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.common</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.core.emffilter/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.core.emffilter/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.core.emffilter/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core.emffilter/META-INF/MANIFEST.MF
index eacac3a..9aec339 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Emffilter
Bundle-SymbolicName: org.eclipse.emf.ecp.core.emffilter;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.core.emffilter.internal.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.emf.ecp.core;bundle-version="[1.0.0,2.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml b/bundles/org.eclipse.emf.ecp.core.emffilter/pom.xml
index e5e0357..e29b7a6 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.core.emffilter</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.core/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.core/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.core/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.core/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.core/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.core/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
index 816cdf9..bdb6aeb 100644
--- a/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Core
Bundle-SymbolicName: org.eclipse.emf.ecp.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.internal.core.Activator
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,
diff --git a/bundles/org.eclipse.emf.ecp.core/about.mappings b/bundles/org.eclipse.emf.ecp.core/about.mappings
index 720ca87..b11c870 100644
--- a/bundles/org.eclipse.emf.ecp.core/about.mappings
+++ b/bundles/org.eclipse.emf.ecp.core/about.mappings
@@ -3,4 +3,4 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# This file does not need to be translated.
-0=@build@
\ No newline at end of file
+0=${BUILD_ID}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.ecp.core/pom.xml b/bundles/org.eclipse.emf.ecp.core/pom.xml
index 4cf33f5..7a2ef66 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProjectManager.java b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProjectManager.java
index c91911c..5fb5f53 100644
--- a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProjectManager.java
+++ b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProjectManager.java
@@ -13,10 +13,23 @@
import org.eclipse.emf.ecp.core.exceptions.ECPProjectWithNameExistsException;
import org.eclipse.emf.ecp.core.util.ECPProperties;
+import org.eclipse.emf.ecp.core.util.ECPUtil;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserverBus;
+import org.eclipse.emf.ecp.core.util.observer.ECPProjectContentChangedObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPProjectOpenClosedObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPProjectPreDeleteObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPProjectsChangedObserver;
import java.util.Collection;
/**
+ * The ECPProjectManager provides access to ECPProjects and manages their lifecycle.
+ * It publishes observable events on the {@link ECPObserverBus}.
+ * Related Observer types: {@link ECPProjectsChangedObserver}, {@link ECPProjectContentChangedObserver},
+ * {@link ECPProjectOpenClosedObserver}, {@link ECPProjectPreDeleteObserver}. Use {@link ECPUtil#getECPObserverBus()} to
+ * retrieve the ObserverBus and {@link ECPObserverBus#register(ECPObserver)} to register an Observer.
+ *
* @author Eike Stepper
* @author Jonas
* @author Eugen Neufeld
diff --git a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProviderRegistry.java b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProviderRegistry.java
index adb3e39..e723345 100644
--- a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProviderRegistry.java
+++ b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPProviderRegistry.java
@@ -15,10 +15,18 @@
package org.eclipse.emf.ecp.core;
+import org.eclipse.emf.ecp.core.util.ECPUtil;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserverBus;
+import org.eclipse.emf.ecp.core.util.observer.ECPProvidersChangedObserver;
+
import java.util.Collection;
/**
* Registry class to manage the registered providers.
+ * It publishes observable events on the {@link ECPObserverBus}.
+ * Related ECPObserver types: {@link ECPProvidersChangedObserver}. Use {@link ECPUtil#getECPObserverBus()} to
+ * retrieve the ObserverBus and {@link ECPObserverBus#register(ECPObserver)} to register an Observer.
*
* @author Eike Stepper
* @author Jonas
diff --git a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPRepositoryManager.java b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPRepositoryManager.java
index 7c0719d..162986f 100644
--- a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPRepositoryManager.java
+++ b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/ECPRepositoryManager.java
@@ -15,13 +15,23 @@
package org.eclipse.emf.ecp.core;
import org.eclipse.emf.ecp.core.util.ECPProperties;
+import org.eclipse.emf.ecp.core.util.ECPUtil;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserverBus;
+import org.eclipse.emf.ecp.core.util.observer.ECPRepositoriesChangedObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPRepositoryContentChangedObserver;
import java.util.Collection;
/**
* The ECPRepositoryManager contains all ECPRepositories and manages their lifecycle.
+ * It publishes observable events on the {@link ECPObserverBus}.
+ * Related Observer types: {@link ECPRepositoriesChangedObserver}, {@link ECPRepositoryContentChangedObserver}.
+ * Use {@link ECPUtil#getECPObserverBus()} to retrieve the ObserverBus and {@link ECPObserverBus#register(ECPObserver)}
+ * to register an Observer.
*
* @author Eike Stepper
+ * @author Jonas
* @noimplement This interface is not intended to be implemented by clients.
* @noextend This interface is not intended to be extended by clients.
*/
diff --git a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/util/ECPProperties.java b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/util/ECPProperties.java
index 6a840d3..6bf04a8 100644
--- a/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/util/ECPProperties.java
+++ b/bundles/org.eclipse.emf.ecp.core/src/org/eclipse/emf/ecp/core/util/ECPProperties.java
@@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.emf.ecp.core.util;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserver;
+import org.eclipse.emf.ecp.core.util.observer.ECPObserverBus;
import org.eclipse.emf.ecp.core.util.observer.ECPPropertiesObserver;
import java.util.Collection;
@@ -22,6 +24,10 @@
/**
* {@link ECPProperties} are used to store key - value - pairs.
*
+ * It publishes observable events on the {@link ECPObserverBus}.
+ * Related Observer types: {@link ECPPropertiesObserver}. Use {@link ECPUtil#getECPObserverBus()} to
+ * retrieve the ObserverBus and {@link ECPObserverBus#register(ECPObserver)} to register an Observer.
+ *
* @author Eike Stepper
* @author Eugen Neufeld
* @noextend This interface is not intended to be extended by clients.
diff --git a/bundles/org.eclipse.emf.ecp.doc/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.doc/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.doc/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.doc/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.doc/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.doc/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
index 5044693..ecfa6c2 100644
--- a/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.doc/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
Bundle-ManifestVersion: 2
Bundle-Name: Doc
Bundle-SymbolicName: org.eclipse.emf.ecp.doc; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/org.eclipse.emf.ecp.doc/pom.xml b/bundles/org.eclipse.emf.ecp.doc/pom.xml
index ed3825b..4eead22 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.doc</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit.swt/META-INF/MANIFEST.MF
index 8418c94..d744c8e 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Edit SWT
Bundle-SymbolicName: org.eclipse.emf.ecp.edit.swt;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.edit.internal.swt.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.emf.ecp.edit;bundle-version="1.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 ba894be..2e5e040 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.edit.swt</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
index 6bcb71f..7d75338 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalControl.java
@@ -31,8 +31,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Text;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.ParsePosition;
@@ -117,7 +115,8 @@
value.addValueChangeListener(new IValueChangeListener() {
public void handleValueChange(ValueChangeEvent event) {
Object newValue = event.diff.getNewValue();
- DecimalFormat format = setupFormat();
+ DecimalFormat format = NumericalHelper.setupFormat(getModelElementContext().getLocale(),
+ getInstanceClass());
try {
Number number = format.parse((String) newValue);
value.setValue(format.format(number));
@@ -138,67 +137,15 @@
private String getFormatText() {
- if (isInteger()) {
+ if (NumericalHelper.isInteger(getInstanceClass())) {
return "The format is '#'.";
- } else if (isDouble()) {
+ } else if (NumericalHelper.isDouble(getInstanceClass())) {
return "The format is '#.#'.";
}
return "";
}
- private boolean isDouble() {
- Class<?> instanceClass = getInstanceClass();
- if (instanceClass.isPrimitive()) {
- try {
- return Double.class.getField("TYPE").get(null).equals(instanceClass)
- || Float.class.getField("TYPE").get(null).equals(instanceClass);
- } catch (IllegalArgumentException ex) {
- Activator.logException(ex);
- } catch (SecurityException ex) {
- Activator.logException(ex);
- } catch (IllegalAccessException ex) {
- Activator.logException(ex);
- } catch (NoSuchFieldException ex) {
- Activator.logException(ex);
- }
- } else if (BigDecimal.class.isAssignableFrom(instanceClass)) {
- return true;
- } else if (Double.class.isAssignableFrom(instanceClass)) {
- return true;
- } else if (Float.class.isAssignableFrom(instanceClass)) {
- return true;
- }
-
- return false;
- }
-
- private boolean isInteger() {
- Class<?> instanceClass = getInstanceClass();
- if (instanceClass.isPrimitive()) {
- try {
- return Integer.class.getField("TYPE").get(null).equals(instanceClass)
- || Long.class.getField("TYPE").get(null).equals(instanceClass);
- } catch (IllegalArgumentException ex) {
- Activator.logException(ex);
- } catch (SecurityException ex) {
- Activator.logException(ex);
- } catch (IllegalAccessException ex) {
- Activator.logException(ex);
- } catch (NoSuchFieldException ex) {
- Activator.logException(ex);
- }
- } else if (BigInteger.class.isAssignableFrom(instanceClass)) {
- return true;
- } else if (Integer.class.isAssignableFrom(instanceClass)) {
- return true;
- } else if (Long.class.isAssignableFrom(instanceClass)) {
- return true;
- }
-
- return false;
- }
-
// TODO: Remarks EM:
// NumericalModelToTargetUpdateStrategy and NumericalTargetToModelUpdateStrategy
// both use the same format, when converting values form the model to the target
@@ -208,7 +155,8 @@
@Override
public Object convertValue(Object value) {
- final DecimalFormat format = setupFormat();
+ final DecimalFormat format = NumericalHelper.setupFormat(getModelElementContext().getLocale(),
+ getInstanceClass());
return format.format(value);
}
}
@@ -219,7 +167,7 @@
NumericalTargetToModelUpdateStrategy() {
super();
- format = setupFormat();
+ format = NumericalHelper.setupFormat(getModelElementContext().getLocale(), getInstanceClass());
}
@@ -229,14 +177,14 @@
try {
Number number = null;
if (value == null) {
- number = getDefaultValue();
+ number = NumericalHelper.getDefaultValue(getInstanceClass());
} else {
ParsePosition pp = new ParsePosition(0);
number = format.parse((String) value, pp);
if (pp.getErrorIndex() != -1 || pp.getIndex() != ((String) value).length()) {
return revertToOldValue(value);
}
- if (isInteger()) {
+ if (NumericalHelper.isInteger(getInstanceClass())) {
boolean maxValue = false;
Class<?> instanceClass = getInstanceClass();
String formatedValue = "";
@@ -266,7 +214,7 @@
if (maxValue) {
getText().setText(formatedValue);
- return numberToInstanceClass(number);
+ return NumericalHelper.numberToInstanceClass(number, getInstanceClass());
}
}
}
@@ -284,54 +232,12 @@
if (formatedNumber.length() == 0) {
return null;
}
- return numberToInstanceClass(format.parse(formatedNumber));
+ return NumericalHelper.numberToInstanceClass(format.parse(formatedNumber), getInstanceClass());
} catch (ParseException ex) {
return revertToOldValue(value);
}
}
- /**
- * @param number
- * @return
- */
- private Object numberToInstanceClass(Number number) {
- Class<?> instanceClass = getInstanceClass();
- if (instanceClass.isPrimitive()) {
- try {
- if (Double.class.getField("TYPE").get(null).equals(instanceClass)) {
- return number.doubleValue();
- } else if (Integer.class.getField("TYPE").get(null).equals(instanceClass)) {
- return number.intValue();
- } else if (Long.class.getField("TYPE").get(null).equals(instanceClass)) {
- return number.longValue();
- } else if (Float.class.getField("TYPE").get(null).equals(instanceClass)) {
- return number.floatValue();
- }
- } catch (IllegalArgumentException ex) {
- Activator.logException(ex);
- } catch (SecurityException ex) {
- Activator.logException(ex);
- } catch (IllegalAccessException ex) {
- Activator.logException(ex);
- } catch (NoSuchFieldException ex) {
- Activator.logException(ex);
- }
- } else if (BigDecimal.class.isAssignableFrom(instanceClass)) {
- return number;
- } else if (Double.class.isAssignableFrom(instanceClass)) {
- return Double.valueOf(number.doubleValue());
- } else if (BigInteger.class.isAssignableFrom(instanceClass)) {
- return ((BigDecimal) number).toBigInteger();
- } else if (Integer.class.isAssignableFrom(instanceClass)) {
- return Integer.valueOf(number.intValue());
- } else if (Long.class.isAssignableFrom(instanceClass)) {
- return Long.valueOf(number.longValue());
- } else if (Float.class.isAssignableFrom(instanceClass)) {
- return Float.valueOf(number.floatValue());
- }
- return number;
- }
-
private Object revertToOldValue(final Object value) {
if (getStructuralFeature().getDefaultValue() == null && (value == null || value.equals(""))) {
@@ -365,70 +271,4 @@
}
}
- private DecimalFormat setupFormat() {
-
- DecimalFormat format = (DecimalFormat) DecimalFormat.getNumberInstance(getModelElementContext().getLocale());
- format.setParseIntegerOnly(isInteger());
- format.setParseBigDecimal(getInstanceClass().equals(BigDecimal.class)
- || getInstanceClass().equals(BigInteger.class));
- format.setGroupingUsed(false);
-
- // EAnnotation annotation = getStructuralFeature().getEType().getEAnnotation(
- // "http:///org/eclipse/emf/ecore/util/ExtendedMetaData");
- // String stringTotalDigits = annotation.getDetails().get("totalDigits");
- // if (stringTotalDigits != null) {
- // String stringFractionDigits = annotation.getDetails().get("fractionDigits");
- // int fractionalDigits = 0;
- // if (stringFractionDigits != null) {
- // fractionalDigits = Integer.valueOf(stringFractionDigits);
- // format.setMaximumFractionDigits(fractionalDigits);
- // format.setMinimumFractionDigits(fractionalDigits);
- // }
- // Integer totalDigits = Integer.valueOf(stringTotalDigits);
- // int integerDigits = totalDigits - fractionalDigits;
- // format.setMaximumIntegerDigits(integerDigits);
- // } else {
- format.setMaximumFractionDigits(100);
- // }
- return format;
- }
-
- /**
- * @return
- */
- private Number getDefaultValue() {
- Class<?> instanceClass = getInstanceClass();
- if (instanceClass.isPrimitive()) {
- try {
- if (Double.class.getField("TYPE").get(null).equals(instanceClass)
- || Float.class.getField("TYPE").get(null).equals(instanceClass)
- || Integer.class.getField("TYPE").get(null).equals(instanceClass)
- || Long.class.getField("TYPE").get(null).equals(instanceClass)) {
- return 0;
- }
- } catch (IllegalArgumentException ex) {
- Activator.logException(ex);
- } catch (SecurityException ex) {
- Activator.logException(ex);
- } catch (IllegalAccessException ex) {
- Activator.logException(ex);
- } catch (NoSuchFieldException ex) {
- Activator.logException(ex);
- }
- } else if (BigDecimal.class.isAssignableFrom(instanceClass)) {
- return null;
- } else if (Double.class.isAssignableFrom(instanceClass)) {
- return null;
- } else if (Float.class.isAssignableFrom(instanceClass)) {
- return null;
- } else if (BigInteger.class.isAssignableFrom(instanceClass)) {
- return null;
- } else if (Integer.class.isAssignableFrom(instanceClass)) {
- return null;
- } else if (Long.class.isAssignableFrom(instanceClass)) {
- return null;
- }
- return null;
- }
-
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalHelper.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalHelper.java
new file mode 100644
index 0000000..0e20dff
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/NumericalHelper.java
@@ -0,0 +1,181 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eugen Neufeld - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.ecp.edit.internal.swt.controls;
+
+import org.eclipse.emf.ecp.edit.internal.swt.Activator;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.DecimalFormat;
+import java.util.Locale;
+
+/**
+ * @author Eugen Neufeld
+ *
+ */
+public class NumericalHelper {
+
+ public static DecimalFormat setupFormat(Locale locale, Class<?> instanceClass) {
+
+ DecimalFormat format = (DecimalFormat) DecimalFormat.getNumberInstance(locale);
+ format.setParseIntegerOnly(isInteger(instanceClass));
+ format.setParseBigDecimal(instanceClass.equals(BigDecimal.class) || instanceClass.equals(BigInteger.class));
+ format.setGroupingUsed(false);
+
+ // EAnnotation annotation = getStructuralFeature().getEType().getEAnnotation(
+ // "http:///org/eclipse/emf/ecore/util/ExtendedMetaData");
+ // String stringTotalDigits = annotation.getDetails().get("totalDigits");
+ // if (stringTotalDigits != null) {
+ // String stringFractionDigits = annotation.getDetails().get("fractionDigits");
+ // int fractionalDigits = 0;
+ // if (stringFractionDigits != null) {
+ // fractionalDigits = Integer.valueOf(stringFractionDigits);
+ // format.setMaximumFractionDigits(fractionalDigits);
+ // format.setMinimumFractionDigits(fractionalDigits);
+ // }
+ // Integer totalDigits = Integer.valueOf(stringTotalDigits);
+ // int integerDigits = totalDigits - fractionalDigits;
+ // format.setMaximumIntegerDigits(integerDigits);
+ // } else {
+ format.setMaximumFractionDigits(100);
+ // }
+ return format;
+ }
+
+ /**
+ * @return
+ */
+ public static Number getDefaultValue(Class<?> instanceClass) {
+ if (instanceClass.isPrimitive()) {
+ try {
+ if (Double.class.getField("TYPE").get(null).equals(instanceClass)
+ || Float.class.getField("TYPE").get(null).equals(instanceClass)
+ || Integer.class.getField("TYPE").get(null).equals(instanceClass)
+ || Long.class.getField("TYPE").get(null).equals(instanceClass)) {
+ return 0;
+ }
+ } catch (IllegalArgumentException ex) {
+ Activator.logException(ex);
+ } catch (SecurityException ex) {
+ Activator.logException(ex);
+ } catch (IllegalAccessException ex) {
+ Activator.logException(ex);
+ } catch (NoSuchFieldException ex) {
+ Activator.logException(ex);
+ }
+ } else if (BigDecimal.class.isAssignableFrom(instanceClass)) {
+ return null;
+ } else if (Double.class.isAssignableFrom(instanceClass)) {
+ return null;
+ } else if (Float.class.isAssignableFrom(instanceClass)) {
+ return null;
+ } else if (BigInteger.class.isAssignableFrom(instanceClass)) {
+ return null;
+ } else if (Integer.class.isAssignableFrom(instanceClass)) {
+ return null;
+ } else if (Long.class.isAssignableFrom(instanceClass)) {
+ return null;
+ }
+ return null;
+ }
+
+ public static boolean isDouble(Class<?> instanceClass) {
+ if (instanceClass.isPrimitive()) {
+ try {
+ return Double.class.getField("TYPE").get(null).equals(instanceClass)
+ || Float.class.getField("TYPE").get(null).equals(instanceClass);
+ } catch (IllegalArgumentException ex) {
+ Activator.logException(ex);
+ } catch (SecurityException ex) {
+ Activator.logException(ex);
+ } catch (IllegalAccessException ex) {
+ Activator.logException(ex);
+ } catch (NoSuchFieldException ex) {
+ Activator.logException(ex);
+ }
+ } else if (BigDecimal.class.isAssignableFrom(instanceClass)) {
+ return true;
+ } else if (Double.class.isAssignableFrom(instanceClass)) {
+ return true;
+ } else if (Float.class.isAssignableFrom(instanceClass)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ public static boolean isInteger(Class<?> instanceClass) {
+ if (instanceClass.isPrimitive()) {
+ try {
+ return Integer.class.getField("TYPE").get(null).equals(instanceClass)
+ || Long.class.getField("TYPE").get(null).equals(instanceClass);
+ } catch (IllegalArgumentException ex) {
+ Activator.logException(ex);
+ } catch (SecurityException ex) {
+ Activator.logException(ex);
+ } catch (IllegalAccessException ex) {
+ Activator.logException(ex);
+ } catch (NoSuchFieldException ex) {
+ Activator.logException(ex);
+ }
+ } else if (BigInteger.class.isAssignableFrom(instanceClass)) {
+ return true;
+ } else if (Integer.class.isAssignableFrom(instanceClass)) {
+ return true;
+ } else if (Long.class.isAssignableFrom(instanceClass)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * @param number
+ * @return
+ */
+ public static Object numberToInstanceClass(Number number, Class<?> instanceClass) {
+ if (instanceClass.isPrimitive()) {
+ try {
+ if (Double.class.getField("TYPE").get(null).equals(instanceClass)) {
+ return number.doubleValue();
+ } else if (Integer.class.getField("TYPE").get(null).equals(instanceClass)) {
+ return number.intValue();
+ } else if (Long.class.getField("TYPE").get(null).equals(instanceClass)) {
+ return number.longValue();
+ } else if (Float.class.getField("TYPE").get(null).equals(instanceClass)) {
+ return number.floatValue();
+ }
+ } catch (IllegalArgumentException ex) {
+ Activator.logException(ex);
+ } catch (SecurityException ex) {
+ Activator.logException(ex);
+ } catch (IllegalAccessException ex) {
+ Activator.logException(ex);
+ } catch (NoSuchFieldException ex) {
+ Activator.logException(ex);
+ }
+ } else if (BigDecimal.class.isAssignableFrom(instanceClass)) {
+ return number;
+ } else if (Double.class.isAssignableFrom(instanceClass)) {
+ return Double.valueOf(number.doubleValue());
+ } else if (BigInteger.class.isAssignableFrom(instanceClass)) {
+ return ((BigDecimal) number).toBigInteger();
+ } else if (Integer.class.isAssignableFrom(instanceClass)) {
+ return Integer.valueOf(number.intValue());
+ } else if (Long.class.isAssignableFrom(instanceClass)) {
+ return Long.valueOf(number.longValue());
+ } else if (Float.class.isAssignableFrom(instanceClass)) {
+ return Float.valueOf(number.floatValue());
+ }
+ return number;
+ }
+}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/ReferenceMultiControlTester.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/ReferenceMultiControlTester.java
index 367966c..770ca47 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/ReferenceMultiControlTester.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/ReferenceMultiControlTester.java
@@ -75,9 +75,9 @@
if (EAttribute.class.isInstance(feature)) {
return NOT_APPLICABLE;
} else if (EReference.class.isInstance(feature)) {
- if (((EReference) feature).isContainment()) {
- return NOT_APPLICABLE;
- }
+ // if (((EReference) feature).isContainment()) {
+ // return NOT_APPLICABLE;
+ // }
Class<?> instanceClass = feature.getEType().getInstanceClass();
if (!tester.getSupportedClassType().isAssignableFrom(instanceClass)) {
return NOT_APPLICABLE;
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
index bc34f6e..4be5b15 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/TableControl.java
@@ -253,7 +253,7 @@
}
final CellEditor cellEditor = CellEditorFactory.INSTANCE.getCellEditor(itemPropertyDescriptor,
- tempInstance, tableViewer.getTable());
+ tempInstance, tableViewer.getTable(), getModelElementContext());
// create a new column
final TableViewerColumn column = new TableViewerColumn(tableViewer, cellEditor.getStyle());
@@ -376,6 +376,11 @@
}
protected Binding createBinding(IObservableValue target, IObservableValue model) {
+ if (ECPCellEditor.class.isInstance(cellEditor)) {
+ return getDataBindingContext().bindValue(target, model,
+ ((ECPCellEditor) cellEditor).getTargetToModelStrategy(),
+ ((ECPCellEditor) cellEditor).getModelToTargetStrategy());
+ }
return getDataBindingContext().bindValue(target, model);
}
@@ -606,7 +611,9 @@
if (!featureErrorMap.containsKey(object)) {
featureErrorMap.put(object, new HashMap<EStructuralFeature, Diagnostic>());
}
- featureErrorMap.get(object).put((EStructuralFeature) diagnostic.getData().get(1), diagnostic);
+ if (diagnostic.getData().size() > 1) {
+ featureErrorMap.get(object).put((EStructuralFeature) diagnostic.getData().get(1), diagnostic);
+ }
tableViewer.update(object, null);
// tableViewer.refresh();
}
@@ -617,7 +624,7 @@
*/
public void resetValidation() {
featureErrorMap.clear();
- tableViewer.refresh();
+ // tableViewer.refresh();
if (validationLabel == null || validationLabel.isDisposed()) {
return;
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java
index 56119f1..508494c 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/controls/XmlDateControlText.java
@@ -123,6 +123,7 @@
calendar.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
+ binding.updateTargetToModel();
binding.dispose();
dialog.close();
}
@@ -131,6 +132,7 @@
calendar.addFocusListener(new FocusListener() {
public void focusLost(FocusEvent event) {
+ binding.updateTargetToModel();
binding.dispose();
dialog.close();
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/DateCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/DateCellEditor.java
index 0814415..24b94d5 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/DateCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/DateCellEditor.java
@@ -11,9 +11,11 @@
*******************************************************************************/
package org.eclipse.emf.ecp.edit.internal.swt.table;
+import org.eclipse.emf.ecp.edit.ECPControlContext;
import org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.databinding.swt.WidgetValueProperty;
@@ -83,7 +85,7 @@
};
}
- public void instantiate(IItemPropertyDescriptor descriptor) {
+ public void instantiate(IItemPropertyDescriptor descriptor, ECPControlContext ecpControlContext) {
}
@@ -215,4 +217,22 @@
public int getColumnWidthWeight() {
return 75;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getTargetToModelStrategy()
+ */
+ public UpdateValueStrategy getTargetToModelStrategy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getModelToTargetStrategy()
+ */
+ public UpdateValueStrategy getModelToTargetStrategy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/LinkCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/LinkCellEditor.java
index 7e49d04..0aa258f 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/LinkCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/LinkCellEditor.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.ecp.edit.internal.swt.table;
import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.ecp.edit.ECPControlContext;
import org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor;
import org.eclipse.emf.ecp.edit.util.ECPModelElementChangeListener;
import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
@@ -19,6 +20,7 @@
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.databinding.swt.WidgetValueProperty;
@@ -80,7 +82,7 @@
};
}
- public void instantiate(IItemPropertyDescriptor descriptor) {
+ public void instantiate(IItemPropertyDescriptor descriptor, ECPControlContext ecpControlContext) {
this.descriptor = descriptor;
}
@@ -194,4 +196,22 @@
public int getColumnWidthWeight() {
return 100;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getTargetToModelStrategy()
+ */
+ public UpdateValueStrategy getTargetToModelStrategy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getModelToTargetStrategy()
+ */
+ public UpdateValueStrategy getModelToTargetStrategy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
index b1ad9da..d19e610 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/NumberCellEditor.java
@@ -11,20 +11,36 @@
*******************************************************************************/
package org.eclipse.emf.ecp.edit.internal.swt.table;
+import org.eclipse.emf.databinding.EMFUpdateValueStrategy;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecp.edit.ECPControlContext;
+import org.eclipse.emf.ecp.edit.internal.swt.Activator;
+import org.eclipse.emf.ecp.edit.internal.swt.controls.NumericalHelper;
import org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor;
+import org.eclipse.emf.ecp.edit.internal.swt.util.ECPDialogExecutor;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.databinding.viewers.CellEditorProperties;
+import org.eclipse.jface.dialogs.IDialogLabelKeys;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
-import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.ParsePosition;
public class NumberCellEditor extends TextCellEditor implements ECPCellEditor {
+ private IItemPropertyDescriptor descriptor;
+ private ECPControlContext ecpControlContext;
+
public NumberCellEditor(Composite parent) {
super(parent, SWT.RIGHT);
}
@@ -37,7 +53,9 @@
return CellEditorProperties.control().value(WidgetProperties.text(SWT.FocusOut));
}
- public void instantiate(IItemPropertyDescriptor descriptor) {
+ public void instantiate(IItemPropertyDescriptor descriptor, ECPControlContext ecpControlContext) {
+ this.descriptor = descriptor;
+ this.ecpControlContext = ecpControlContext;
getControl().setData(CUSTOM_VARIANT, "org_eclipse_emf_ecp_edit_cellEditor_numberical");
// do nothing
}
@@ -52,11 +70,14 @@
return "";
}
- if (BigDecimal.class.isInstance(value)) {
- BigDecimal bigDecimal = (BigDecimal) value;
- bigDecimal.toPlainString();
- }
- return ((Number) value).toString();
+ DecimalFormat format = NumericalHelper.setupFormat(ecpControlContext.getLocale(), getInstanceClass());
+ return format.format(value);
+
+ // if (BigDecimal.class.isInstance(value)) {
+ // BigDecimal bigDecimal = (BigDecimal) value;
+ // bigDecimal.toPlainString();
+ // }
+ // return ((Number) value).toString();
}
/*
@@ -67,4 +88,145 @@
return 50;
}
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getTargetToModelStrategy()
+ */
+ public UpdateValueStrategy getTargetToModelStrategy() {
+ return new EMFUpdateValueStrategy() {
+
+ @Override
+ public Object convert(final Object value) {
+ DecimalFormat format = format = NumericalHelper.setupFormat(ecpControlContext.getLocale(),
+ getInstanceClass());
+ try {
+ Number number = null;
+ if (value == null) {
+ number = NumericalHelper.getDefaultValue(getInstanceClass());
+ } else {
+ ParsePosition pp = new ParsePosition(0);
+ number = format.parse((String) value, pp);
+ if (pp.getErrorIndex() != -1 || pp.getIndex() != ((String) value).length()) {
+ return revertToOldValue(value);
+ }
+ if (NumericalHelper.isInteger(getInstanceClass())) {
+ boolean maxValue = false;
+ Class<?> instanceClass = getInstanceClass();
+ String formatedValue = "";
+ try {
+ if (Integer.class.isAssignableFrom(instanceClass)
+ || Integer.class.getField("TYPE").get(null).equals(instanceClass)) {
+ if (Integer.MAX_VALUE == number.intValue()) {
+ maxValue = true;
+ formatedValue = format.format(Integer.MAX_VALUE);
+ }
+ } else if (Long.class.isAssignableFrom(instanceClass)
+ || Long.class.getField("TYPE").get(null).equals(instanceClass)) {
+ if (Long.MAX_VALUE == number.longValue()) {
+ maxValue = true;
+ formatedValue = format.format(Long.MAX_VALUE);
+ }
+ }
+ } catch (IllegalArgumentException ex) {
+ Activator.logException(ex);
+ } catch (SecurityException ex) {
+ Activator.logException(ex);
+ } catch (IllegalAccessException ex) {
+ Activator.logException(ex);
+ } catch (NoSuchFieldException ex) {
+ Activator.logException(ex);
+ }
+
+ if (maxValue) {
+ getText().setText(formatedValue);
+ return NumericalHelper.numberToInstanceClass(number, getInstanceClass());
+ }
+ }
+ }
+ String formatedNumber = "";
+ if (number != null) {
+ formatedNumber = format.format(number);
+ }
+ // if (number.toString().contains("E")
+ // || ((String) value).matches("0*" + formatedNumber + "\\"
+ // + format.getDecimalFormatSymbols().getDecimalSeparator() + "?0*")) {
+ //
+ // }
+ // return revertToOldValue(value);
+ getText().setText(formatedNumber);
+ if (formatedNumber.length() == 0) {
+ return null;
+ }
+ return NumericalHelper.numberToInstanceClass(format.parse(formatedNumber), getInstanceClass());
+ } catch (ParseException ex) {
+ return revertToOldValue(value);
+ }
+ }
+
+ private Object revertToOldValue(final Object value) {
+
+ if (getStructuralFeature().getDefaultValue() == null && (value == null || value.equals(""))) {
+ return null;
+ }
+
+ // Object result = getModelValue().getValue();
+ Object result = null;
+
+ MessageDialog messageDialog = new MessageDialog(getText().getShell(), "Invalid Number", null,
+ "The Number you have entered is invalid. The value will be unset.", MessageDialog.ERROR,
+ new String[] { JFaceResources.getString(IDialogLabelKeys.OK_LABEL_KEY) }, 0);
+
+ new ECPDialogExecutor(messageDialog) {
+ @Override
+ public void handleResult(int codeResult) {
+
+ }
+ }.execute();
+
+ if (result == null) {
+ getText().setText("");
+ } else {
+ DecimalFormat format = format = NumericalHelper.setupFormat(ecpControlContext.getLocale(),
+ getInstanceClass());
+ getText().setText(format.format(result));
+ }
+
+ // if (getStructuralFeature().isUnsettable() && result == null) {
+ // showUnsetLabel();
+ // return SetCommand.UNSET_VALUE;
+ // }
+ return result;
+ }
+ };
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getModelToTargetStrategy()
+ */
+ public UpdateValueStrategy getModelToTargetStrategy() {
+ return new EMFUpdateValueStrategy() {
+ @Override
+ public Object convert(Object value) {
+ if (value == null) {
+ return "";
+ }
+ final DecimalFormat format = NumericalHelper.setupFormat(ecpControlContext.getLocale(),
+ getInstanceClass());
+ return format.format(value);
+ }
+ };
+ }
+
+ private Class<?> getInstanceClass() {
+ return getStructuralFeature().getEType().getInstanceClass();
+ }
+
+ private Text getText() {
+ return text;
+ }
+
+ private EStructuralFeature getStructuralFeature() {
+ return (EStructuralFeature) descriptor.getFeature(null);
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/XmlDateCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/XmlDateCellEditor.java
index e1742df..92f12ee 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/XmlDateCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/table/XmlDateCellEditor.java
@@ -12,9 +12,11 @@
package org.eclipse.emf.ecp.edit.internal.swt.table;
import org.eclipse.emf.ecore.xml.type.internal.XMLCalendar;
+import org.eclipse.emf.ecp.edit.ECPControlContext;
import org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.jface.databinding.swt.WidgetValueProperty;
@@ -84,7 +86,7 @@
};
}
- public void instantiate(IItemPropertyDescriptor descriptor) {
+ public void instantiate(IItemPropertyDescriptor descriptor, ECPControlContext ecpControlContext) {
}
@@ -208,4 +210,22 @@
public int getColumnWidthWeight() {
return 75;
}
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getTargetToModelStrategy()
+ */
+ public UpdateValueStrategy getTargetToModelStrategy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.emf.ecp.edit.internal.swt.util.ECPCellEditor#getModelToTargetStrategy()
+ */
+ public UpdateValueStrategy getModelToTargetStrategy() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java
index 68b411f..d5db138 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/CellEditorFactory.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.ecp.edit.internal.swt.util;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecp.edit.ECPControlContext;
import org.eclipse.emf.ecp.edit.internal.swt.Activator;
import org.eclipse.emf.ecp.edit.util.ECPApplicableTester;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -76,7 +77,8 @@
}
- public CellEditor getCellEditor(IItemPropertyDescriptor propertyDescriptor, EObject eObject, Table table) {
+ public CellEditor getCellEditor(IItemPropertyDescriptor propertyDescriptor, EObject eObject, Table table,
+ ECPControlContext ecpControlContext) {
int bestPriority = -1;
CellDescriptor bestCandidate = null;
for (CellDescriptor descriptor : descriptors) {
@@ -93,7 +95,7 @@
Composite.class);
result = constructor.newInstance(table);
ECPCellEditor ecpCellEditor = (ECPCellEditor) result;
- ecpCellEditor.instantiate(propertyDescriptor);
+ ecpCellEditor.instantiate(propertyDescriptor, ecpControlContext);
} catch (SecurityException e) {
Activator.logException(e);
} catch (NoSuchMethodException e) {
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPCellEditor.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPCellEditor.java
index 2468c7a..fd5960f 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPCellEditor.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/ECPCellEditor.java
@@ -12,8 +12,10 @@
*******************************************************************************/
package org.eclipse.emf.ecp.edit.internal.swt.util;
+import org.eclipse.emf.ecp.edit.ECPControlContext;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.core.databinding.UpdateValueStrategy;
import org.eclipse.core.databinding.property.value.IValueProperty;
/**
@@ -30,7 +32,7 @@
IValueProperty getValueProperty();
- void instantiate(IItemPropertyDescriptor descriptor);
+ void instantiate(IItemPropertyDescriptor descriptor, ECPControlContext ecpControlContext);
int getStyle();
@@ -50,4 +52,8 @@
* @return the relative column width
*/
int getColumnWidthWeight();
+
+ UpdateValueStrategy getTargetToModelStrategy();
+
+ UpdateValueStrategy getModelToTargetStrategy();
}
diff --git a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java
index 43b409a..6f1a4e4 100644
--- a/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java
+++ b/bundles/org.eclipse.emf.ecp.edit.swt/src/org/eclipse/emf/ecp/edit/internal/swt/util/SWTControl.java
@@ -305,9 +305,9 @@
if (modelValue != null) {
return modelValue;
}
- IObservableValue model = EMFEditObservables.observeValue(getModelElementContext().getEditingDomain(),
+ modelValue = EMFEditObservables.observeValue(getModelElementContext().getEditingDomain(),
getModelElementContext().getModelElement(), getStructuralFeature());
- return model;
+ return modelValue;
}
/**
diff --git a/bundles/org.eclipse.emf.ecp.edit/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.edit/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.edit/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.edit/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.edit/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
index a94bff2..d0ba25b 100644
--- a/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Edit
Bundle-SymbolicName: org.eclipse.emf.ecp.edit;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.internal.edit.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.6.0",
diff --git a/bundles/org.eclipse.emf.ecp.edit/pom.xml b/bundles/org.eclipse.emf.ecp.edit/pom.xml
index 8975c57..7b27b74 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.edit</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.editor.e3/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.editor.e3/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.editor.e3/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.editor.e3/META-INF/MANIFEST.MF
index ab715b4..768434a 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,7 +2,7 @@
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.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.editor.internal.e3.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.editor;bundle-version="[1.0.0,2.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 bee269e..3ff5516 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.editor.e3</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.editor/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.editor/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.editor/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.editor/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.editor/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.editor/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.editor/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
index 19b153c..4c4ceaf 100644
--- a/bundles/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Editor Plug-in
Bundle-SymbolicName: org.eclipse.emf.ecp.editor;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.internal.editor.Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.editor/pom.xml b/bundles/org.eclipse.emf.ecp.editor/pom.xml
index 69e4727..5c0867a 100644
--- a/bundles/org.eclipse.emf.ecp.editor/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.editor/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.editor</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.emfstore.core/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.core/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.emfstore.core/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emfstore.core/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
index 9a107dd..5328456 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore Provider Core Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.emfstore.core.internal.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.core;bundle-version="[1.0.0,2.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.core/pom.xml
index 7840c1d..26b2b90 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfstore.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.localserver/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.emfstore.localserver/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emfstore.localserver/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.localserver/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.emfstore.localserver/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emfstore.localserver/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.localserver/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.localserver/META-INF/MANIFEST.MF
index e728bae..fa91992 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.localserver/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.emfstore.localserver/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Local EMFstore
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.localserver;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.emfstore.localserver.internal.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.emf.emfstore.server;bundle-version="[1.0.0,2.0.0)"
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.localserver/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.localserver/pom.xml
index 72df95c..8691f9e 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.localserver/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.localserver/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfstore.localserver</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui.search/META-INF/MANIFEST.MF
index 3a4d1b0..1781201 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Search UI
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui.search;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.emfstore.ui.search.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.core;bundle-version="[1.0.0,2.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 b9c7e97..2ff70ca 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfstore.ui.search</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.emfstore.ui/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.emfstore.ui/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
index 778e217..72757c5 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP EMFStore UI Provider
Bundle-SymbolicName: org.eclipse.emf.ecp.emfstore.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.ui.Activator
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)",
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/plugin.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui/plugin.xml
index 717453e..2c5f469 100644
--- a/bundles/org.eclipse.emf.ecp.emfstore.ui/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.emfstore.ui/plugin.xml
@@ -1038,4 +1038,10 @@
checkoutObserver="org.eclipse.emf.ecp.emfstore.internal.ui.observer.CheckoutObserver">
</observer>
</extension>
+ <extension
+ point="org.eclipse.emf.emfstore.client.ui.disableSaveControls">
+ <disableControls
+ enabled="true">
+ </disableControls>
+ </extension>
</plugin>
diff --git a/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml b/bundles/org.eclipse.emf.ecp.emfstore.ui/pom.xml
index 5158935..cc63c33 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfstore.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.explorereditorbridge/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.explorereditorbridge/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
index 617f97a..0c0ea98 100644
--- a/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Explorer Editor Bridge
Bundle-SymbolicName: org.eclipse.emf.ecp.explorereditorbridge;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.explorereditorbridge.internal.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml b/bundles/org.eclipse.emf.ecp.explorereditorbridge/pom.xml
index 70c1e74..0284bb3 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.explorereditorbridge</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.graphiti.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.graphiti.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.core/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.graphiti.core/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.graphiti.core/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.graphiti.core/META-INF/MANIFEST.MF
index 4dfd28b..ef57aee 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.graphiti.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Graphiti Editor
Bundle-SymbolicName: org.eclipse.emf.ecp.graphiti.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.internal.graphiti.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.graphiti;bundle-version="0.10.0",
@@ -18,7 +18,7 @@
org.eclipse.jface.util,
org.eclipse.ui;ui.workbench=split,
org.eclipse.ui.part;ui.workbench=split,
- org.eclipse.ui.views.properties,
+ org.eclipse.ui.views.properties;ui.views=split;version="0.0.0",
org.eclipse.ui.views.properties.tabbed
Export-Package: org.eclipse.emf.ecp.graphiti,
org.eclipse.emf.ecp.internal.graphiti;x-internal:=true
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.core/pom.xml b/bundles/org.eclipse.emf.ecp.graphiti.core/pom.xml
index 07b2194..9a419dc 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.core/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.graphiti.core/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.graphiti.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.graphiti.integration/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.graphiti.integration/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
index 13b63e2..25b1011 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Graphiti Integration
Bundle-SymbolicName: org.eclipse.emf.ecp.graphiti.integration;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.graphiti.internal.integration.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/pom.xml b/bundles/org.eclipse.emf.ecp.graphiti.integration/pom.xml
index 409b9cb..922fbd0 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.integration/pom.xml
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.graphiti.integration</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.rap/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.rap/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.rap/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.rap/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.rap/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.rap/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
index fbc6a6b..73de764 100644
--- a/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP RAP
Bundle-SymbolicName: org.eclipse.emf.ecp.rap; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.rap.Activator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
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 8193a9d..577be36 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Eclipse 3.x Integration
Bundle-SymbolicName: org.eclipse.emf.ecp.ui.e3;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.ui.platform.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml b/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
index 5943a30..71a5f65 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/plugin.xml
@@ -353,6 +353,14 @@
icon="icons/database_save.png"
label="%SaveProject"
style="push">
+ <visibleWhen
+ checkEnabled="false">
+ <test
+ args="org.eclipse.emf.ecp.ui.workbench.saveProject"
+ property="org.eclipse.emf.ecp.ui.e3.workbench.menu.enablement"
+ value="true">
+ </test>
+ </visibleWhen>
</command>
</menuContribution>
<menuContribution
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml b/bundles/org.eclipse.emf.ecp.ui.e3/pom.xml
index 0814d94..02a0c5c 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui.e3</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/platform/Activator.java b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/platform/Activator.java
index b458fd9..b0cb48d 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/platform/Activator.java
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/platform/Activator.java
@@ -20,8 +20,17 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.ecp.core.ECPProject;
+import org.eclipse.emf.ecp.core.ECPProjectManager;
+import org.eclipse.emf.ecp.core.util.ECPUtil;
+import org.eclipse.emf.ecp.internal.ui.util.ECPHandlerHelper;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchListener;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -47,6 +56,18 @@
public void start(BundleContext context) throws Exception {
super.start(context);
instance = this;
+
+ PlatformUI.getWorkbench().addWorkbenchListener(new IWorkbenchListener() {
+
+ public boolean preShutdown(IWorkbench workbench, boolean forced) {
+
+ return ECPHandlerHelper.showDirtyProjectsDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
+ }
+
+ public void postShutdown(IWorkbench workbench) {
+ // do nothing
+ }
+ });
}
@Override
diff --git a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/tester/ECPMenuContributionsEnablementTester.java b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/tester/ECPMenuContributionsEnablementTester.java
index 525d0b3..d92d632 100644
--- a/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/tester/ECPMenuContributionsEnablementTester.java
+++ b/bundles/org.eclipse.emf.ecp.ui.e3/src/org/eclipse/emf/ecp/ui/tester/ECPMenuContributionsEnablementTester.java
@@ -14,43 +14,48 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
-/**
- * Tests the enablement of ECP Menu contributions. The contributions are enabled by default and can be disabled by an extension point.
+/**
+ * Tests the enablement of ECP Menu contributions. The contributions are enabled by default and can be disabled by an
+ * extension point.
+ *
* @author koegel
- *
+ *
*/
public class ECPMenuContributionsEnablementTester extends PropertyTester {
-
/**
* {@inheritDoc}
- * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
+ *
+ * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[],
+ * java.lang.Object)
*/
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-
+
if (expectedValue instanceof Boolean) {
- //default behavior, display menu contribution
+ // default behavior, display menu contribution
Boolean menuContributionEnabled = true;
- //fetch contribution configuration
+ // fetch contribution configuration
IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(
"org.eclipse.emf.ecp.ui.e3.menuContributionEnablement");
if (elements != null && elements.length > 0) {
- IConfigurationElement configurationElement = elements[0];
- // fetch configured default option. true = blacklist; false = whitelist
- menuContributionEnabled = Boolean.parseBoolean(configurationElement.getAttribute("enabled"));
- // iterate over configured exceptions
- for (IConfigurationElement child: configurationElement.getChildren()) {
- String commandID = child.getAttribute("commandID");
- //if blacklist & command on list -> block
- if(menuContributionEnabled && args[0].equals(commandID)) {
- return expectedValue.equals(false);
- // if whitelist & command on list -> don't block
- } else if(!menuContributionEnabled && args[0].equals(commandID)) {
- return expectedValue.equals(true);
+ for (IConfigurationElement configurationElement : elements) {
+
+ // fetch configured default option. true = blacklist; false = whitelist
+ menuContributionEnabled = Boolean.parseBoolean(configurationElement.getAttribute("enabled"));
+ // iterate over configured exceptions
+ for (IConfigurationElement child : configurationElement.getChildren()) {
+ String commandID = child.getAttribute("commandID");
+ // if blacklist & command on list -> block
+ if (menuContributionEnabled && args[0].equals(commandID)) {
+ return expectedValue.equals(false);
+ // if whitelist & command on list -> don't block
+ } else if (!menuContributionEnabled && args[0].equals(commandID)) {
+ return expectedValue.equals(true);
+ }
}
}
}
-
+
return expectedValue.equals(menuContributionEnabled);
}
return false;
diff --git a/bundles/org.eclipse.emf.ecp.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.ui/.settings/org.eclipse.core.resources.prefs
index 6c7086b..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.ui/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.ui/.settings/org.eclipse.core.resources.prefs
@@ -3,3 +3,4 @@
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.ui/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.ui/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
index 4539843..0b52458 100644
--- a/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP UI
Bundle-SymbolicName: org.eclipse.emf.ecp.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.internal.ui.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
diff --git a/bundles/org.eclipse.emf.ecp.ui/pom.xml b/bundles/org.eclipse.emf.ecp.ui/pom.xml
index 439ee2a..0a646ba 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java
index bbb12cd..f753623 100644
--- a/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java
+++ b/bundles/org.eclipse.emf.ecp.ui/src/org/eclipse/emf/ecp/internal/ui/util/ECPHandlerHelper.java
@@ -17,6 +17,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecp.core.ECPProject;
+import org.eclipse.emf.ecp.core.ECPProjectManager;
import org.eclipse.emf.ecp.core.ECPProvider;
import org.eclipse.emf.ecp.core.ECPRepository;
import org.eclipse.emf.ecp.core.exceptions.ECPProjectWithNameExistsException;
@@ -51,10 +52,15 @@
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
import org.osgi.framework.Bundle;
@@ -426,4 +432,48 @@
public static void openRepositoryProperties(ECPRepository repository, boolean editable, Shell shell) {
new RepositoryPropertiesDialog(shell, editable, repository).open();
}
+
+ public static boolean showDirtyProjectsDialog(Shell shell) {
+ ECPProjectManager manager = ECPUtil.getECPProjectManager();
+
+ List<ECPProject> dirtyProjects = new ArrayList<ECPProject>();
+ for (ECPProject project : manager.getProjects()) {
+ if (project.hasDirtyContents()) {
+ dirtyProjects.add(project);
+ }
+ }
+ if (dirtyProjects.isEmpty()) {
+ return true;
+ }
+ ListSelectionDialog lsd = new ListSelectionDialog(shell, dirtyProjects, ArrayContentProvider.getInstance(),
+ new LabelProvider() {
+
+ @Override
+ public Image getImage(Object element) {
+ if (ECPProject.class.isInstance(element)) {
+ return Activator.getImage("icons/project_open.gif");
+ }
+ return super.getImage(element);
+ }
+
+ @Override
+ public String getText(Object element) {
+ if (ECPProject.class.isInstance(element)) {
+ return ((ECPProject) element).getName();
+ }
+ return super.getText(element);
+ }
+
+ }, "Select the projects, which should be saved.");
+ lsd.setInitialSelections(manager.getProjects().toArray());
+ lsd.setTitle("Unsaved Projects");
+ int result = lsd.open();
+ if (Window.OK == result) {
+ for (Object o : lsd.getResult()) {
+ ECPHandlerHelper.saveProject((ECPProject) o);
+ }
+ return true;
+ }
+ return false;
+ }
}
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.validation.connector/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.validation.connector/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.validation.connector/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validation.connector/META-INF/MANIFEST.MF
index a8f10fe..4562848 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation Connector Plugin
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.connector;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.validation.connector.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecp.validation;bundle-version="1.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 8e77454..7795cf9 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation.connector</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.validation/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.validation/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.validation/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.validation/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.validation/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.validation/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
index 5dbcf02..97abef9 100644
--- a/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Validation Service
Bundle-SymbolicName: org.eclipse.emf.ecp.validation;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.internal.validation.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.8.1",
diff --git a/bundles/org.eclipse.emf.ecp.validation/pom.xml b/bundles/org.eclipse.emf.ecp.validation/pom.xml
index 1a59d1e..fb8df04 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.workspace.core/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.core/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.workspace.core/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.workspace.core/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.core/META-INF/MANIFEST.MF
index c45a28f..e563bce 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Workspace Integration Core
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.core.Activator
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)",
diff --git a/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.core/pom.xml
index 0f53168..be94486 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.workspace.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.emf.ecp.workspace.ui/.settings/org.eclipse.core.resources.prefs
index 3a053a2..468556b 100644
--- a/bundles/org.eclipse.emf.ecp.workspace.ui/.settings/org.eclipse.core.resources.prefs
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 04 13:04:43 CEST 2011
eclipse.preferences.version=1
encoding//model/eresource.ecorediag=UTF-8
encoding//model/etypes.ecore=UTF-8
encoding//model/etypes.ecorediag=UTF-8
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.emf.ecp.workspace.ui/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/bundles/org.eclipse.emf.ecp.workspace.ui/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
index a50ae97..2e62570 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Workspace Integration UI
Bundle-SymbolicName: org.eclipse.emf.ecp.workspace.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Activator: org.eclipse.emf.ecp.workspace.internal.ui.Activator
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)",
diff --git a/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml b/bundles/org.eclipse.emf.ecp.workspace.ui/pom.xml
index 0b4e392..a8a1815 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.workspace.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.cdo.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.cdo.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.cdo.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.cdo.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
index 39bb686..ff51262 100644
--- a/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.cdo.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.ecp.cdo.feature"
label="EMF Client Platform CDO Integration (Experimental)"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.cdo.core"
image="eclipse_update_120.jpg"
diff --git a/features/org.eclipse.emf.ecp.cdo.feature/pom.xml b/features/org.eclipse.emf.ecp.cdo.feature/pom.xml
index 03e5d55..68da821 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.cdo.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.e3.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.e3.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.e3.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.e3.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.e3.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.e3.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.e3.feature/feature.xml b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
index 06415fc..ceb30dc 100644
--- a/features/org.eclipse.emf.ecp.e3.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.e3.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.e3.feature"
label="EMF Client Platform UI 3.x Feature"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.ui.e3"
image="eclipse_update_120.jpg"
diff --git a/features/org.eclipse.emf.ecp.e3.feature/pom.xml b/features/org.eclipse.emf.ecp.e3.feature/pom.xml
index 64a0ded..541903f 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.e3.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.emfstore.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.emfstore.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
index b4eedc2..e25f212 100644
--- a/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.emfstore.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.emfstore.feature"
label="EMF Client Platform EMFStore Integration"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.emfstore.core"
image="eclipse_update_120.jpg"
diff --git a/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml b/features/org.eclipse.emf.ecp.emfstore.feature/pom.xml
index 9b1afef..37bf9d0 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.emfstore.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.feature/feature.xml b/features/org.eclipse.emf.ecp.feature/feature.xml
index ae5e0eb..2566f56 100644
--- a/features/org.eclipse.emf.ecp.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.ecp.feature"
label="EMF Client Platform (Core)"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.core"
image="eclipse_update_120.jpg"
diff --git a/features/org.eclipse.emf.ecp.feature/pom.xml b/features/org.eclipse.emf.ecp.feature/pom.xml
index 2dc20a6..ea5355e 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.graphiti.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.graphiti.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.graphiti.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.graphiti.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.graphiti.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.graphiti.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.graphiti.feature/feature.xml b/features/org.eclipse.emf.ecp.graphiti.feature/feature.xml
index 3ceafa2..e968809 100644
--- a/features/org.eclipse.emf.ecp.graphiti.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.graphiti.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.graphiti.feature"
label="ECP Graphiti Feature"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
license-feature-version="1.0.0">
diff --git a/features/org.eclipse.emf.ecp.graphiti.feature/pom.xml b/features/org.eclipse.emf.ecp.graphiti.feature/pom.xml
index 038d92f..7a06c82 100644
--- a/features/org.eclipse.emf.ecp.graphiti.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.graphiti.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.graphiti.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.license.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.license.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.license.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.license.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.license.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.license.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.license.feature/pom.xml b/features/org.eclipse.emf.ecp.license.feature/pom.xml
index f22268c..d7ff409 100644
--- a/features/org.eclipse.emf.ecp.license.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.license.feature/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/features/org.eclipse.emf.ecp.rap.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.rap.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.rap.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.rap.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.rap.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.rap.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.rap.feature/feature.xml b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
index 4b4d1f0..90ed5a9 100644
--- a/features/org.eclipse.emf.ecp.rap.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.rap.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.rap.feature"
label="ECP RAP Feature"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.rap">
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.sdk.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.sdk.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.sdk.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.sdk.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
index 3d3fd98..d8ab1dc 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.sdk.feature"
label="ECP SDK Feature"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
license-feature-version="1.0.0">
diff --git a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
index 158e63d..fd28c2a 100644
--- a/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.sdk.feature/pom.xml
@@ -6,11 +6,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.sdk.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.site.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.site.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.site.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.site.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.site.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.site.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.site.feature/aggregateSite.properties b/features/org.eclipse.emf.ecp.site.feature/aggregateSite.properties
index b9c4992..95893a8 100644
--- a/features/org.eclipse.emf.ecp.site.feature/aggregateSite.properties
+++ b/features/org.eclipse.emf.ecp.site.feature/aggregateSite.properties
@@ -1 +1 @@
-associate.sites=http://download.eclipse.org/emf-store/milestones/100RC3
\ No newline at end of file
+associate.sites=http://download.eclipse.org/emf-store/milestones/100RC5
\ No newline at end of file
diff --git a/features/org.eclipse.emf.ecp.site.feature/category.xml b/features/org.eclipse.emf.ecp.site.feature/category.xml
index 3a9c214..9211278 100644
--- a/features/org.eclipse.emf.ecp.site.feature/category.xml
+++ b/features/org.eclipse.emf.ecp.site.feature/category.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.ecp.validation.feature_1.0.0.qualifier.jar" id="org.eclipse.emf.ecp.validation.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.emf.ecp.validation.feature_1.0.1.qualifier.jar" id="org.eclipse.emf.ecp.validation.feature" version="1.0.1.qualifier">
<category name="org.eclipse.emf.ecp.extra.category"/>
</feature>
- <feature url="features/org.eclipse.emf.ecp.feature_1.0.0.qualifier.jar" id="org.eclipse.emf.ecp.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.emf.ecp.feature_1.0.1.qualifier.jar" id="org.eclipse.emf.ecp.feature" version="1.0.1.qualifier">
<category name="org.eclipse.emf.ecp.category"/>
</feature>
- <feature url="features/org.eclipse.emf.ecp.cdo.feature_1.0.0.qualifier.jar" id="org.eclipse.emf.ecp.cdo.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.emf.ecp.cdo.feature_1.0.1.qualifier.jar" id="org.eclipse.emf.ecp.cdo.feature" version="1.0.1.qualifier">
<category name="org.eclipse.emf.ecp.provider.category"/>
</feature>
- <feature url="features/org.eclipse.emf.ecp.emfstore.feature_1.0.0.qualifier.jar" id="org.eclipse.emf.ecp.emfstore.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.emf.ecp.emfstore.feature_1.0.1.qualifier.jar" id="org.eclipse.emf.ecp.emfstore.feature" version="1.0.1.qualifier">
<category name="org.eclipse.emf.ecp.provider.category"/>
</feature>
- <feature url="features/org.eclipse.emf.ecp.workspace.feature_1.0.0.qualifier.jar" id="org.eclipse.emf.ecp.workspace.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.emf.ecp.workspace.feature_1.0.1.qualifier.jar" id="org.eclipse.emf.ecp.workspace.feature" version="1.0.1.qualifier">
<category name="org.eclipse.emf.ecp.provider.category"/>
</feature>
- <feature url="features/org.eclipse.emf.ecp.e3.feature_1.0.0.qualifier.jar" id="org.eclipse.emf.ecp.e3.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.emf.ecp.e3.feature_1.0.1.qualifier.jar" id="org.eclipse.emf.ecp.e3.feature" version="1.0.1.qualifier">
<category name="org.eclipse.emf.ecp.3x.category"/>
</feature>
- <feature url="features/org.eclipse.emf.ecp.sdk.feature_1.0.0.qualifier.jar" id="org.eclipse.emf.ecp.sdk.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.emf.ecp.sdk.feature_1.0.1.qualifier.jar" id="org.eclipse.emf.ecp.sdk.feature" version="1.0.1.qualifier">
<category name="org.eclipse.emf.ecp.sdk.category"/>
</feature>
<category-def name="org.eclipse.emf.ecp.category" label="EMF Client Platform"/>
diff --git a/features/org.eclipse.emf.ecp.site.feature/pom.xml b/features/org.eclipse.emf.ecp.site.feature/pom.xml
index 3bdd10e..5110fdf 100644
--- a/features/org.eclipse.emf.ecp.site.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.site.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/features/org.eclipse.emf.ecp.target.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.target.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.target.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.target.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.target.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.target.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.target.feature/feature.xml b/features/org.eclipse.emf.ecp.target.feature/feature.xml
index e442681..d30791a 100644
--- a/features/org.eclipse.emf.ecp.target.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.target.feature"
label="ECP Target Feature"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.ecp.license.feature"
license-feature-version="1.0.0">
@@ -27,13 +27,6 @@
unpack="false"/>
<plugin
- id="org.slf4j.api"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.core.runtime"
download-size="0"
install-size="0"
@@ -1022,4 +1015,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.equinox.bidi"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/features/org.eclipse.emf.ecp.target.feature/pom.xml b/features/org.eclipse.emf.ecp.target.feature/pom.xml
index 68bdf39..945d20b 100644
--- a/features/org.eclipse.emf.ecp.target.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.target.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.target.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.validation.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.validation.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.validation.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.validation.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.validation.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.validation.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.validation.feature/feature.xml b/features/org.eclipse.emf.ecp.validation.feature/feature.xml
index c8a45eb..dccbf48 100644
--- a/features/org.eclipse.emf.ecp.validation.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.validation.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecp.validation.feature"
label="EMF Client Platform Validation Feature"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.validation"
image="eclipse_update_120.jpg"
diff --git a/features/org.eclipse.emf.ecp.validation.feature/pom.xml b/features/org.eclipse.emf.ecp.validation.feature/pom.xml
index 6a6e263..9c28828 100644
--- a/features/org.eclipse.emf.ecp.validation.feature/pom.xml
+++ b/features/org.eclipse.emf.ecp.validation.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.ecp.workspace.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.workspace.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.ecp.workspace.feature/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/features/org.eclipse.emf.ecp.workspace.feature/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
index 1fb278c..b5df74b 100644
--- a/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
+++ b/features/org.eclipse.emf.ecp.workspace.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.ecp.workspace.feature"
label="EMF Client Platform File Integration (Experimental)"
- version="1.0.0.qualifier"
+ version="1.0.1.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.ecp.workspace.core"
image="eclipse_update_120.jpg"
diff --git a/features/org.eclipse.emf.ecp.workspace.feature/pom.xml b/features/org.eclipse.emf.ecp.workspace.feature/pom.xml
index f170332..2c19137 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.workspace.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/releng/_target/ecp.target b/releng/_target/ecp.target
index 20e3b0e..f68efcd 100644
--- a/releng/_target/ecp.target
+++ b/releng/_target/ecp.target
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="213">
+<?pde version="3.8"?><target name="ECP RCP" sequenceNumber="218">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20121212-203907-7M7fA78g4_y-gDvtH0ZcFvhMPDZJ"/>
-<unit id="org.eclipse.jetty.sdk.feature.group" version="8.1.3.201206060641"/>
-<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.1.2.v20130126-1033"/>
-<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.6.0.v20120328-0001-777Z-9A_WsZmcPluNecyPkvrPKlH"/>
-<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.6.0.v20120328-0001-67T-96SGR75UNqZNTdeQnghI6uFA"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.9.0.201212170307"/>
-<unit id="org.eclipse.net4j.sdk.feature.group" version="4.1.2.v20121030-0624"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.8.2.v20130116-090414-8-8nFu3FNOfwKLRuqgXKIy9z0I83"/>
-<repository location="http://download.eclipse.org/releases/juno/"/>
+<unit id="org.eclipse.emf.emfstore.modelmutator.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.ecore.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="1.0.0.v20130624-0607"/>
+<repository location="http://download.eclipse.org/emf-store/milestones/100RC5"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.h2" version="1.1.117.v201105142352"/>
@@ -19,25 +19,21 @@
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="4.2.1.M20120914-1800"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20120522-1841-7M7fA78g5_y-g-jtHxcd5k8q8lFR"/>
+<unit id="org.eclipse.graphiti.feature.feature.group" version="0.10.0.v20130605-1155"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.9.0.v20130530-1629"/>
+<unit id="org.eclipse.net4j.sdk.feature.group" version="4.2.0.v20130601-1611"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.2.0.v20130603-0949"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.7.0.201305221412"/>
+<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.10.0.v20130605-1155"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.9.0.v20130603-0742"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.7.0.201305212004"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="3.9.0.201305060205"/>
+<repository location="http://download.eclipse.org/releases/kepler"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.8.0.v20121212-203907-7M7fA78g4_y-gDvtH0ZcFvhMPDZJ"/>
+<unit id="org.eclipse.platform.ide" version="4.2.2.M20130204-1200"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.2"/>
</location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.graphiti.feature.feature.group" version="0.10.0.v20130522-0609"/>
-<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.10.0.v20130522-0609"/>
-<repository location="http://download.eclipse.org/graphiti/updates/milestones/S-0.10.0RC1-201305220609"/>
-</location>
-<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.emfstore.ecore.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<unit id="org.eclipse.emf.emfstore.client.transaction.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<unit id="org.eclipse.emf.emfstore.modelmutator.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<unit id="org.eclipse.emf.emfstore.client.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<unit id="org.eclipse.emf.emfstore.client.ui.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<unit id="org.eclipse.emf.emfstore.example.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<unit id="org.eclipse.emf.emfstore.common.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<unit id="org.eclipse.emf.emfstore.server.feature.feature.group" version="1.0.0.v20130523-0908"/>
-<repository location="http://download.eclipse.org/emf-store/milestones/100RC4"/>
-</location>
</locations>
</target>
diff --git a/releng/_target/pom.xml b/releng/_target/pom.xml
index ee0abb0..b2e895c 100644
--- a/releng/_target/pom.xml
+++ b/releng/_target/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>
</project>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.products/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.emf.ecp.products/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/releng/org.eclipse.emf.ecp.products/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/releng/org.eclipse.emf.ecp.products/.settings/org.eclipse.core.runtime.prefs b/releng/org.eclipse.emf.ecp.products/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/releng/org.eclipse.emf.ecp.products/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/releng/org.eclipse.emf.ecp.products/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.ecp.products/META-INF/MANIFEST.MF
index 1aec5be..71588c6 100644
--- a/releng/org.eclipse.emf.ecp.products/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.emf.ecp.products/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: ECP Products
Bundle-SymbolicName: org.eclipse.emf.ecp.products
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
diff --git a/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product b/releng/org.eclipse.emf.ecp.products/org.eclipse.emf.ecp.3x.product
index a28be9b..bdeb602 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.0.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.0.1.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.emf.ecp.application.e3/icons/eclipse_lg.gif"/>
@@ -19,6 +19,7 @@
<windowImages i16="/org.eclipse.emf.ecp.ui.e3/icons/bricks.png"/>
+
<launcher name="ecp">
<solaris/>
<win useIco="false">
@@ -30,12 +31,6 @@
<vm>
</vm>
- <license>
- <url>asd</url>
- <text>
- asd
- </text>
- </license>
<plugins>
</plugins>
diff --git a/releng/org.eclipse.emf.ecp.products/pom.xml b/releng/org.eclipse.emf.ecp.products/pom.xml
index 2325c76..51619d6 100644
--- a/releng/org.eclipse.emf.ecp.products/pom.xml
+++ b/releng/org.eclipse.emf.ecp.products/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
diff --git a/releng/org.eclipse.emf.ecp.releng/.checkstyle b/releng/org.eclipse.emf.ecp.releng/.checkstyle
deleted file mode 100644
index ae83e19..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.checkstyle
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
- <local-check-config name="ECPCS" location="http://www.eclipse.org/emfclient/checkstyle/emfcpCS.xml" type="remote" description="">
- <additional-data name="cache-file" value="true"/>
- <additional-data name="cache-props-file-location" value="null_1364481515476_cache.properties"/>
- <additional-data name="cache-file-location" value="null_1364481515476_cache.xml"/>
- </local-check-config>
- <fileset name="all" enabled="true" check-config-name="ECPCS" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/releng/org.eclipse.emf.ecp.releng/.classpath b/releng/org.eclipse.emf.ecp.releng/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/releng/org.eclipse.emf.ecp.releng/.project b/releng/org.eclipse.emf.ecp.releng/.project
index baf3d6e..9f7c361 100644
--- a/releng/org.eclipse.emf.ecp.releng/.project
+++ b/releng/org.eclipse.emf.ecp.releng/.project
@@ -5,30 +5,7 @@
<projects>
</projects>
<buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.core.resources.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.core.resources.prefs
index df1928b..5afc8a9 100644
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.core.resources.prefs
+++ b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,6 @@
-#Mon Jul 11 16:02:40 CEST 2011
eclipse.preferences.version=1
encoding//model/org.eclipse.emf.cdo.defs.ecorediag=UTF-8
+encoding/<project>=UTF-8
encoding/buckminster.cspex=UTF-8
encoding/build.cquery=UTF-8
encoding/build.mspec=UTF-8
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.core.runtime.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 9178397..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Jun 12 18:54:45 CEST 2011
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.jdt.core.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b17b9e6..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,387 +0,0 @@
-eclipse.preferences.version=1
-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.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-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.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.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.missingDeprecatedAnnotation=warning
-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.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=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.rawTypeReference=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.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.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.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED
-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=true
-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
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.jdt.ui.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5d27f4e..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,119 +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=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-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=false
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_EMFT
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_ecpFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=org.eclipse.emf.cdo;org.eclipse.emf.internal.cdo;org.eclipse.net4j;org.eclipse.internal.net4j;org.eclipse.emf;org.eclipse;com;org;javax;java;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment"/><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment"/><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment"/><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) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.\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 * Eike Stepper - initial API and implementation\r\n */</template><template autoinsert\="false" 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 Eike Stepper\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\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment"/><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"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment"/><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">${exception_var}.printStackTrace();</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" 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}</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=false
-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_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-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=false
-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=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-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=true
-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_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=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
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.ltk.core.refactoring.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index 864e30f..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.mylyn.tasks.ui.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644
index b050639..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.mylyn.team.ui.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644
index 2f50f36..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.mylyn.team.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-commit.comment.template=[${task.id}] ${task.description} \r\n${task.url}
-eclipse.preferences.version=1
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.pde.api.tools.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.pde.api.tools.prefs
deleted file mode 100644
index f8d0a06..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.pde.api.tools.prefs
+++ /dev/null
@@ -1,94 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
-ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
-ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
-API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
-CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
-CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
-CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
-CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
-CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
-ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
-ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
-ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
-FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
-FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
-FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
-FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
-ILLEGAL_EXTEND=Warning
-ILLEGAL_IMPLEMENT=Warning
-ILLEGAL_INSTANTIATE=Warning
-ILLEGAL_OVERRIDE=Warning
-ILLEGAL_REFERENCE=Warning
-INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
-INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
-INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
-INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-INVALID_JAVADOC_TAG=Ignore
-INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Ignore
-LEAK_EXTEND=Warning
-LEAK_FIELD_DECL=Warning
-LEAK_IMPLEMENT=Warning
-LEAK_METHOD_PARAM=Warning
-LEAK_METHOD_RETURN_TYPE=Warning
-METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
-METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
-METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
-METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
-METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
-METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
-METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
-TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
-UNUSED_PROBLEM_FILTERS=Ignore
-automatically_removed_unused_problem_filters=Disabled
-eclipse.preferences.version=1
-incompatible_api_component_version=Error
-incompatible_api_component_version_include_major_without_breaking_change=Disabled
-incompatible_api_component_version_include_minor_without_api_change=Disabled
-invalid_since_tag_version=Error
-malformed_since_tag=Error
-missing_since_tag=Error
-report_api_breakage_when_major_version_incremented=Disabled
-report_resolution_errors_api_component=Warning
diff --git a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.pde.prefs b/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index c6b96bb..0000000
--- a/releng/org.eclipse.emf.ecp.releng/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,31 +0,0 @@
-#Thu Feb 04 09:44:24 CET 2010
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=1
-compilers.p.missing-version-export-package=1
-compilers.p.missing-version-import-package=1
-compilers.p.missing-version-require-bundle=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/releng/org.eclipse.emf.ecp.releng/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.ecp.releng/META-INF/MANIFEST.MF
deleted file mode 100644
index 5404940..0000000
--- a/releng/org.eclipse.emf.ecp.releng/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ECP Release Engineering
-Bundle-SymbolicName: org.eclipse.emf.ecp.releng
-Bundle-Version: 1.0.0
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.ecp.releng;version="2.0.0";x-internal:=true
diff --git a/releng/org.eclipse.emf.ecp.releng/buckminster.cspex b/releng/org.eclipse.emf.ecp.releng/buckminster.cspex
deleted file mode 100644
index 052a7fa..0000000
--- a/releng/org.eclipse.emf.ecp.releng/buckminster.cspex
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspecExtension xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0">
- <cs:dependencies>
- <cs:dependency name="org.eclipse.emf.ecp.site" componentType="eclipse.feature"/>
-
- <cs:dependency name="org.eclipse.equinox.executable" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.platform" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.platform.source" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.jdt" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.jdt.source" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.pde" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.pde.source" componentType="eclipse.feature"/>
-
- <!--
- <cs:dependency name="org.eclipse.emf.base" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.emf.base.source" componentType="eclipse.feature"/>
- -->
- <cs:dependency name="org.eclipse.emf" componentType="eclipse.feature"/>
-
- <cs:dependency name="org.eclipse.emf.source" componentType="eclipse.feature"/>
-
- <cs:dependency name="org.eclipse.emf.cdo.sdk" componentType="eclipse.feature"/>
- <cs:dependency name="org.eclipse.net4j.sdk" componentType="eclipse.feature"/>
- </cs:dependencies>
-</cs:cspecExtension>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.releng/build.cquery b/releng/org.eclipse.emf.ecp.releng/build.cquery
deleted file mode 100644
index 982aef1..0000000
--- a/releng/org.eclipse.emf.ecp.releng/build.cquery
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="build.rmap">
-
- <cq:rootRequest name="org.eclipse.emf.ecp.releng" componentType="osgi.bundle"/>
-
- <cq:advisorNode namePattern=".*doc\.isv" skipComponent="true"/>
- <cq:advisorNode namePattern=".*doc\.user" skipComponent="true"/>
-
- <cq:advisorNode namePattern="org\.eclipse\.emf\.ecp.*\.source" skipComponent="true"/>
- <cq:advisorNode namePattern="org\.eclipse\.emf\.cdo\.ecp.*\.source" skipComponent="true"/>
-
- <!-- Orbit's MongoDB plugin causes unpack problems -->
- <cq:advisorNode namePattern=".*mongodb.*" skipComponent="true"/>
-
- <!-- For unknown reasons source 1.0.4 gets included for 1.1.1 -->
- <cq:advisorNode namePattern="org\.apache\.commons\.logging\.source" skipComponent="true"/>
-
- <cq:advisorNode namePattern="^org\.eclipse\.swt\.(?:gtk\.(?:linux\.s390x|aix\.ppc(?:64)?)|motif\.solaris\.sparc|photon\.qnx\.x86)\.source$" skipComponent="true"/>
- <cq:advisorNode namePattern="^org\.eclipse\.swt\.(?:gtk\.aix\.ppc(?:64)?|motif\.solaris\.sparc|photon\.qnx\.x86)$" skipComponent="true"/>
- <cq:advisorNode namePattern="^org\.eclipse\.equinox\.launcher\.gtk\.aix\.ppc(?:64)?$" skipComponent="true"/>
-
- <cq:advisorNode namePattern=".*" useMaterialization="false" useTargetPlatform="false"/>
-
-</cq:componentQuery>
diff --git a/releng/org.eclipse.emf.ecp.releng/build.mspec b/releng/org.eclipse.emf.ecp.releng/build.mspec
deleted file mode 100644
index f16b46d..0000000
--- a/releng/org.eclipse.emf.ecp.releng/build.mspec
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" installLocation="" materializer="p2"
- name="build.mspec" url="build.cquery">
- <mspec:property key="target.os" value="*"/>
- <mspec:property key="target.ws" value="*"/>
- <mspec:property key="target.arch" value="*"/>
- <mspec:property key="resolve.target.platform" value="true"/>
-
- <mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
-</mspec:mspec>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.releng/build.properties b/releng/org.eclipse.emf.ecp.releng/build.properties
deleted file mode 100644
index 5a0449b..0000000
--- a/releng/org.eclipse.emf.ecp.releng/build.properties
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Eike Stepper - initial API and implementation
-
-stream=2.0
-branch=master
-train=juno
-buckminster=3.7
-eclipse=3.8
-emf=2.8
-weekly=I
-
-# This build can be optimized by setting these properties externally:
-# platform = "Windows" | "Linux" | "Mac"
-
-svn.repository=http://dev.eclipse.org/svnroot/modeling/org.eclipse.emf.cdo
-eclipse.downloads=http://download.eclipse.org
-cloudsmith.downloads=http://download.cloudsmith.com
-
-director=${eclipse.downloads}/tools/buckminster/products/director_latest.zip
-buckminster.headless=${eclipse.downloads}/tools/buckminster/headless-${buckminster}
-buckminster.external=${cloudsmith.downloads}/buckminster/external-${buckminster}
-train.releases=${eclipse.downloads}/releases/${train}
-eclipse.updates=${eclipse.downloads}/eclipse/updates/${eclipse}
-eclipse.milestones=${eclipse.downloads}/eclipse/updates/${eclipse}milestones
-
-#qualifier.replacement.*=M3
-qualifier.replacement.*=generator:lastModified
-generator.lastModified.format='v'yyyyMMdd-HHmm
-
-target.os=*
-target.ws=*
-target.arch=*
-
-signing.type=eclipse.local
-
-###########################################################################
-
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-bin.includes = .,\
- META-INF/
-src.includes = buckminster.cspex,\
- build.cquery,\
- build.mspec,\
- build.rmap,\
- build.xml,\
- hudson/,\
- local.mspec,\
- xsl/
diff --git a/releng/org.eclipse.emf.ecp.releng/build.rmap b/releng/org.eclipse.emf.ecp.releng/build.rmap
deleted file mode 100644
index 4c12184..0000000
--- a/releng/org.eclipse.emf.ecp.releng/build.rmap
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rm:rmap xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
- <rm:property key="platform.version" value="3.8"/>
- <rm:property key="emf.version" value="2.8"/>
- <rm:property key="orbit.version" value="S20120123151124"/>
- <rm:property key="git.clone" value="${user.home}/git/ecp.other"/>
- <rm:property key="eclipse.downloads" value="http://download.eclipse.org"/>
- <rm:property key="resolve.target.platform" value="true"/>
- <rm:property key="build.type" value="N"/>
- <rm:locator pattern="^org\.eclipse\.emf\.ecp(?:\..+)?$" searchPathRef="git"/>
- <rm:locator searchPathRef="p2"/>
- <rm:searchPath name="git">
- <rm:provider componentTypes="osgi.bundle" readerType="git">
- <rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.other.git"/>
- <rm:uri format="{0},ECP2/{1}">
- <bc:propertyRef key="git.clone"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature" readerType="git">
- <rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.other.git"/>
- <rm:uri format="{0},ECP2/{1}-feature">
- <bc:propertyRef key="git.clone"/>
- <bc:propertyRef key="buckminster.component"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
- <rm:searchPath name="p2">
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(resolve.target.platform=true)" readerType="p2" source="false" mutable="false">
- <rm:property key="buckminster.source" value="false"/>
- <rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="{0}/releases/juno">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
- </rm:provider>
- <rm:provider componentTypes="eclipse.feature,osgi.bundle" resolutionFilter="(resolve.target.platform=true)" readerType="p2" source="false" mutable="false">
- <rm:property key="buckminster.source" value="false"/>
- <rm:property key="buckminster.mutable" value="false"/>
- <rm:uri format="{0}/emf-store/milestones/latest">
- <bc:propertyRef key="eclipse.downloads"/>
- </rm:uri>
- </rm:provider>
- </rm:searchPath>
-</rm:rmap>
diff --git a/releng/org.eclipse.emf.ecp.releng/build.xml b/releng/org.eclipse.emf.ecp.releng/build.xml
deleted file mode 100644
index a7a9674..0000000
--- a/releng/org.eclipse.emf.ecp.releng/build.xml
+++ /dev/null
@@ -1,488 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Eike Stepper - initial API and implementation
--->
-<project name="ECP">
-
- <property file="build.properties" />
- <property environment="hudson" />
-
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="/develop/bin/ant-contrib/ant-contrib-1.0b3.jar" />
- <pathelement location="${ant.contrib}" />
- </classpath>
- </taskdef>
-
- <macrodef name="eclipse.launch">
- <attribute name="app" />
- <element name="properties" optional="true" />
- <element name="args" optional="true" />
- <sequential>
- <property name="@{app}.deploy.dir" value="${tools}/@{app}" />
- <pathconvert property="@{app}.launcher">
- <first count="1">
- <sort>
- <fileset dir="${@{app}.deploy.dir}/plugins" includes="**/org.eclipse.equinox.launcher_*.jar" />
- <reverse xmlns="antlib:org.apache.tools.ant.types.resources.comparators">
- <date />
- </reverse>
- </sort>
- </first>
- </pathconvert>
- <java fork="true" jar="${@{app}.launcher}" dir="${@{app}.deploy.dir}" failonerror="true">
- <env key="no_proxy" value="${no.proxy}" />
- <properties />
- <args />
- </java>
- </sequential>
- </macrodef>
-
- <macrodef name="buckminster">
- <attribute name="command" />
- <attribute name="workspace" default="${ws}" />
- <element name="sysproperties" optional="true" />
- <element name="globargs" optional="true" />
- <element name="cmdargs" optional="true" />
- <sequential>
- <eclipse.launch app="buckminster">
- <properties>
- <sysproperty key="bugfix.288796" value="true" />
- <sysproperties />
- </properties>
- <args>
- <jvmarg value="-Xmx4096m" />
- <jvmarg value="-Declipse.p2.mirrors=false" />
- <jvmarg value="-Declipse.p2.unsignedPolicy=allow" />
- <jvmarg value="-Dgit.clone=${git.clone}" />
- <arg value="-data" />
- <arg value="@{workspace}" />
- <arg value="--loglevel" />
- <arg value="${hudson.LOGLEVEL}" />
- <arg value="--displaystacktrace" />
- <globargs />
- <arg value="@{command}" />
- <arg value="-P" />
- <arg value="${properties.tmp}" />
- <cmdargs />
- </args>
- </eclipse.launch>
- </sequential>
- </macrodef>
-
- <!-- =============== -->
- <!-- Init Properties -->
- <!-- =============== -->
-
- <target name="-init.properties">
- <echo message="stream = ${stream}" />
- <echo message="branch = ${branch}" />
- <echo message="train = ${train}" />
-
- <condition property="no.proxy" value="${hudson.no_proxy}, dev.eclipse.org" else="dev.eclipse.org">
- <isset property="hudson.no_proxy" />
- </condition>
-
- <property name="git.clone" location="${hudson.WORKSPACE}/git" />
- <property name="releng" location="${git.clone}/ECP2/org.eclipse.emf.ecp.releng" />
- <property name="test.report" location="${hudson.WORKSPACE}/test-report.xml" />
-
- <property name="tools" location="${hudson.WORKSPACE}/tools" />
- <property name="result" location="${hudson.WORKSPACE}/result" />
-
- <property name="ws" location="${result}/ws" />
- <property name="tp" location="${result}/tp" />
-
- <property name="buckminster.output.root" location="${result}/output" />
- <property name="buckminster.temp.root" location="${result}/temp" />
- </target>
-
- <!-- ========== -->
- <!-- Init Clean -->
- <!-- ========== -->
-
- <target name="-init.clean" depends="-init.properties">
- <delete includeemptydirs="true" failonerror="true" quiet="true">
- <fileset dir="${hudson.WORKSPACE}">
- <include name="binary/**" />
- <include name="features/**" />
- <include name="plugins/**" />
- <include name="*.jar" />
- <include name="*.xml" />
- <include name="*.html" />
- </fileset>
- </delete>
-
- <delete dir="${buckminster.output.root}" includeemptydirs="true" failonerror="true" quiet="true" />
- <delete dir="${buckminster.temp.root}" includeemptydirs="true" failonerror="true" quiet="true" />
-
- <mkdir dir="${result}" />
- </target>
-
- <!-- ========== -->
- <!-- Init Tools -->
- <!-- ========== -->
-
- <target name="-init.tools" depends="-init.clean">
- <if>
- <equals arg1="${hudson.CLEAN_TOOLS}" arg2="true" />
- <then>
- <echo message="Cleaning tools" />
- <delete dir="${tools}/director" includeemptydirs="true" failonerror="true" quiet="true" />
- <delete dir="${tools}/buckminster" includeemptydirs="true" failonerror="true" quiet="true" />
- </then>
- </if>
-
- <if>
- <not>
- <available file="${tools}/director/director" />
- </not>
- <then>
- <echo message="" />
- <echo message="Installing director" />
- <tempfile destdir="${java.io.tmpdir}"
- prefix="director-"
- suffix=".zip"
- property="director.zip"
- deleteonexit="true" />
- <get src="${director}" dest="${director.zip}" />
- <mkdir dir="${tools}" />
- <unzip src="${director.zip}" dest="${tools}" />
- <delete file="${director.zip}" />
- </then>
- </if>
-
- <if>
- <not>
- <available file="${tools}/buckminster/buckminster" />
- </not>
- <then>
- <echo message="" />
- <echo message="Installing buckminster" />
- <eclipse.launch app="director">
- <properties>
- <sysproperty key="eclipse.p2.mirrors" value="false" />
- </properties>
- <args>
- <arg value="-r" />
- <arg value="${buckminster.headless}" />
- <arg value="-r" />
- <arg value="${buckminster.external}" />
- <arg value="-d" />
- <arg value="${tools}/buckminster" />
- <arg value="-p" />
- <arg value="Buckminster" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.cmdline.product" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.core.headless.feature.feature.group" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.pde.headless.feature.feature.group" />
- <arg value="-i" />
- <arg value="org.eclipse.buckminster.git.headless.feature.feature.group" />
- </args>
- </eclipse.launch>
- </then>
- </if>
- </target>
-
- <!-- ================ -->
- <!-- Init Build Infos -->
- <!-- ================ -->
-
- <target name="-init.buildinfos" depends="-init.clean">
- <if>
- <not>
- <isset property="build.trigger" />
- </not>
- <then>
- <xmlproperty keeproot="false">
- <url url="${hudson.BUILD_URL}/api/xml?tree=actions[causes[shortDescription]]" />
- </xmlproperty>
- <loadresource property="build.trigger">
- <propertyresource name="action.cause.shortDescription" />
- <filterchain>
- <replaceregex pattern="^Started by " replace="" />
- <replaceregex pattern="^Gestartet durch " replace="" />
- <replaceregex pattern="Benutzer" replace="user" />
- </filterchain>
- </loadresource>
- </then>
- </if>
- <echo message="build.trigger = ${build.trigger}" />
-
- <if>
- <equals arg1="${hudson.BUILD_TYPE}" arg2="<default>" />
- <then>
- <condition property="build.type" value="${weekly}" else="N">
- <equals arg1="${build.trigger}" arg2="timer" />
- </condition>
- </then>
- <else>
- <property name="build.type" value="${hudson.BUILD_TYPE}" />
- </else>
- </if>
- <echo message="build.type = ${build.type}" />
-
- <property name="build.timestamp" value="${hudson.BUILD_ID}" />
- <echo message="build.timestamp = ${build.timestamp}" />
-
- <tempfile property="build.qualifier.tmp"
- destdir="${java.io.tmpdir}"
- prefix="build-qualifier-"
- suffix=".tmp"
- deleteonexit="true" />
- <echo message="build.qualifier=${build.type}${build.timestamp}" file="${build.qualifier.tmp}" />
- <replaceregexp file="${build.qualifier.tmp}">
- <regexp pattern="([0-9]*)-([0-9]*)-([0-9]*)_([0-9]*)-([0-9]*)-([0-9]*)" />
- <substitution expression="\1\2\3-\4\5" />
- </replaceregexp >
- <property file="${build.qualifier.tmp}" />
- <echo message="build.qualifier = ${build.qualifier}" />
- <echoxml file="${hudson.WORKSPACE}/build-info.xml">
- <build stream="${stream}"
- branch="${branch}"
- train="${train}"
- eclipse="${eclipse}"
- emf="${emf}"
- type="${build.type}"
- timestamp="${build.timestamp}"
- qualifier="${build.qualifier}"
- trigger="${build.trigger}"
- hudson="${hudson.HUDSON_URL}"
- revision="${hudson.GIT_COMMIT}"
- job="${hudson.JOB_NAME}"
- number="${hudson.BUILD_NUMBER}" />
- </echoxml>
-
- <condition property="site.signing" value="true" else="false">
- <and>
- <not>
- <equals arg1="${build.type}" arg2="N" />
- </not>
- <equals arg1="${hudson.HUDSON_URL}" arg2="https://hudson.eclipse.org/hudson/" />
- </and>
- </condition>
- <echo message="site.signing = ${site.signing}" />
-
- <if>
- <equals arg1="${site.signing}" arg2="true" />
- <then>
- <property name="eclipse.staging.area"
- value="/shared/download-staging.priv/modeling/emf/ecp/${hudson.JOB_NAME}" />
- <echo message="eclipse.staging.area = ${eclipse.staging.area}" />
- </then>
- </if>
-
- <echo message="" />
-
- <property name="properties.tmp" value="${result}${file.separator}buckminster.properties" />
- <echoproperties destfile="${properties.tmp}">
- <propertyset negate="true">
- <propertyref name="basedir" />
- <propertyref name="eclipse.home" />
- <propertyref name="properties.tmp" />
- <propertyref name="line.separator" />
- <propertyref name="path.separator" />
- <propertyref prefix="ant." />
- <propertyref prefix="file." />
- <propertyref prefix="java." />
- <propertyref prefix="sun." />
- <propertyref prefix="user." />
- </propertyset>
- </echoproperties>
- <echo message="${hudson.JOB_URL}ws/result/buckminster.properties" />
-
- <echoproperties destfile="${result}/all.properties" />
- <echo message="${hudson.JOB_URL}ws/result/all.properties" />
- </target>
-
- <!-- ============== -->
- <!-- Init Workspace -->
- <!-- ============== -->
-
- <target name="-init.workspace" depends="-init.clean">
- <echo message="Initializing workspace" />
-
- <if>
- <equals arg1="${hudson.CLEAN_TP}" arg2="true" />
- <then>
- <delete dir="${tp}" includeemptydirs="true" failonerror="true" quiet="true" />
- </then>
- </if>
-
- <delete dir="${ws}" includeemptydirs="true" failonerror="true" quiet="true" />
- <unzip dest="${ws}" src="${releng}/hudson/workspace.zip" />
- <copy file="${releng}/hudson/test-report-empty.xml" tofile="${test.report}" />
- </target>
-
- <!-- ========= -->
- <!-- Provision -->
- <!-- ========= -->
-
- <target name="provision"
- depends="-init.tools,-init.buildinfos,-init.workspace"
- description="Imports projects and binaries">
- <echo message="Importing projects into ${ws}" />
- <echo message="Importing binaries into ${tp}" />
-
- <mkdir dir="${tp}" />
- <buckminster command="import">
- <cmdargs>
- <arg value="-B" />
- <arg value="${hudson.WORKSPACE}/bom.xml" />
-
- <arg value="-P" />
- <arg value="${basedir}/build.properties" />
-
- <!-- Last argument: -->
- <arg value="${basedir}/build.mspec" />
- </cmdargs>
- </buckminster>
- </target>
-
- <!-- ===== -->
- <!-- Build -->
- <!-- ===== -->
-
- <target name="build" depends="provision" description="Builds all projects">
- <echo message="Building all projects in workspace ${ws}" />
- <buckminster command="build">
- <cmdargs>
- <arg value="--thorough" />
- </cmdargs>
- </buckminster>
- </target>
-
- <!-- ======= -->
- <!-- Site.p2 -->
- <!-- ======= -->
-
- <target name="site.p2" depends="build" description="Generates the site and depending artifacts">
- <echo message="Performing org.eclipse.emf.ecp.site#site.p2" />
- <buckminster command="perform">
- <cmdargs>
- <arg value="org.eclipse.emf.ecp.site#site.p2" />
- </cmdargs>
- </buckminster>
-
- <pathconvert property="site.p2.dir">
- <dirset dir="${buckminster.output.root}">
- <filename name="org.eclipse.emf.ecp.site_${stream}.*-eclipse.feature/site.p2" />
- </dirset>
- </pathconvert>
- <echoproperties destfile="${result}/all.properties" />
-
- <copy todir="${hudson.WORKSPACE}"
- overwrite="true"
- includeemptydirs="true"
- preservelastmodified="true"
- failonerror="true">
- <fileset dir="${site.p2.dir}">
- <include name="**" />
- </fileset>
- </copy>
-
- <antcall target="-generate.all" />
- </target>
-
- <!-- ==== -->
- <!-- Test -->
- <!-- ==== -->
-
- <target name="test" depends="site.p2" description="Runs the tests">
- <echo message="Running JUnit tests" />
- <buckminster command="junit">
- <cmdargs>
- <arg value="-l" />
- <arg value="org.eclipse.emf.ecp.tests/ECP AllTests.launch" />
- <arg value="-o" />
- <arg value="${test.report}" />
- <arg value="--terseXML" />
- <arg value="--flatXML" />
- </cmdargs>
- </buckminster>
- </target>
-
- <!-- ============= -->
- <!-- Generate Only -->
- <!-- ============= -->
-
- <target name="generate.only" depends="-init.properties" description="Runs the post-site.p2 generators">
- <echo message="Loading build-info.xml" />
- <xmlproperty file="${hudson.WORKSPACE}/build-info.xml" collapseAttributes="true" />
- <antcall target="-generate.all" />
- </target>
-
- <!-- ============ -->
- <!-- Generate All -->
- <!-- ============ -->
-
- <target name="-generate.all">
- <property name="zips" location="${hudson.WORKSPACE}/zips" />
- <mkdir dir="${zips}" />
-
- <antcall target="-generate.index" />
- <antcall target="-generate.bookmarks" />
-
- <if>
- <equals arg1="${hudson.GENERATE_PRODUCTS}" arg2="true" />
- <then>
- <antcall target="-generate.products" />
- </then>
- </if>
- </target>
-
- <!-- ============== -->
- <!-- Generate Index -->
- <!-- ============== -->
-
- <target name="-generate.index">
- <unzip src="${hudson.WORKSPACE}/content.jar" dest="${hudson.WORKSPACE}" />
- <property name="content.xml" location="${hudson.WORKSPACE}/content.xml" />
- <xslt style="xsl/content2html.xsl" in="${content.xml}" out="${hudson.WORKSPACE}/index.html" />
- <xslt style="xsl/content2xml.xsl" in="${content.xml}" out="${hudson.WORKSPACE}/index.xml" />
- <delete file="${content.xml}" />
- </target>
-
- <!-- =================== -->
- <!-- Generate Booksmarks -->
- <!-- =================== -->
-
- <target name="-generate.bookmarks">
- <property name="bookmarks.tmp" location="${hudson.WORKSPACE}/bookmarks.tmp" />
- <xslt style="xsl/bom2bookmarks.xsl" in="${hudson.WORKSPACE}/bom.xml" out="${bookmarks.tmp}" />
- <replace file="${bookmarks.tmp}" token="http://dev.eclipse.org" value="file://to-be-removed" />
- <replace file="${bookmarks.tmp}" token="file:/home/data/httpd/" value="http://" />
- <property name="bookmarks.xml" location="${hudson.WORKSPACE}/bookmarks.xml" />
- <concat destfile="${bookmarks.xml}">
- <header filtering="false"><?xml version="1.0" encoding="UTF-8"?>
-<bookmarks>
-</header>
- <union>
- <sort>
- <tokens>
- <file file="${bookmarks.tmp}" />
- <linetokenizer includedelims="true" />
- </tokens>
- </sort>
- </union>
- <filterchain>
- <linecontains>
- <contains value="http://" />
- </linecontains>
- </filterchain>
- <footer filtering="false"></bookmarks>
- </footer>
- </concat>
- <delete file="${bookmarks.tmp}" />
- </target>
-
-</project>
diff --git a/releng/org.eclipse.emf.ecp.releng/hudson/test-report-empty.xml b/releng/org.eclipse.emf.ecp.releng/hudson/test-report-empty.xml
deleted file mode 100644
index 74270c8..0000000
--- a/releng/org.eclipse.emf.ecp.releng/hudson/test-report-empty.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<testsuite name="ECP AllTests" tests="1" errors="0" failures="0" ignored="0">
- <testcase name="noTestHasBeenExecuted" classname="org.eclipse.emf.ecp.tests.NoTest" time="0.00"/>
-</testsuite>
diff --git a/releng/org.eclipse.emf.ecp.releng/hudson/workspace.zip b/releng/org.eclipse.emf.ecp.releng/hudson/workspace.zip
deleted file mode 100644
index 72918c2..0000000
--- a/releng/org.eclipse.emf.ecp.releng/hudson/workspace.zip
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.emf.ecp.releng/local.mspec b/releng/org.eclipse.emf.ecp.releng/local.mspec
deleted file mode 100644
index e733754..0000000
--- a/releng/org.eclipse.emf.ecp.releng/local.mspec
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mspec:mspec xmlns:mspec="http://www.eclipse.org/buckminster/MetaData-1.0" installLocation="" materializer="p2"
- name="local.mspec" url="build.cquery">
- <mspec:property key="target.os" value="*"/>
- <mspec:property key="target.ws" value="*"/>
- <mspec:property key="target.arch" value="*"/>
- <mspec:property key="resolve.target.platform" value="true"/>
-
- <mspec:property key="eclipse.downloads" value="http://download.eclipse.org"/>
- <mspec:property key="buckminster.download.source" value="true"/>
-
- <mspec:mspecNode materializer="workspace" filter="(buckminster.source=true)"/>
-</mspec:mspec>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.releng/pom.xml b/releng/org.eclipse.emf.ecp.releng/pom.xml
index 212d21d..58424e8 100644
--- a/releng/org.eclipse.emf.ecp.releng/pom.xml
+++ b/releng/org.eclipse.emf.ecp.releng/pom.xml
@@ -5,13 +5,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>ecp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>0.18.0</tycho-version>
<tycho-extras-version>0.18.0</tycho-extras-version>
<javadoc-version>2.9</javadoc-version>
+ <javadoc-title>EMF Client Platform 1.0.1 API</javadoc-title>
<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.core.git</tycho.scmUrl>
@@ -34,7 +35,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <ecp-version>1.0.0-SNAPSHOT</ecp-version>
+ <ecp-version>1.0.1-SNAPSHOT</ecp-version>
</properties>
</profile>
</profiles>
@@ -195,6 +196,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc-version}</version>
<configuration>
+ <doctitle>${javadoc-title}</doctitle>
<show>protected</show>
<show>public</show>
<nohelp>true</nohelp>
diff --git a/releng/org.eclipse.emf.ecp.releng/src/org/eclipse/emf/ecp/releng/Dummy.java b/releng/org.eclipse.emf.ecp.releng/src/org/eclipse/emf/ecp/releng/Dummy.java
deleted file mode 100644
index 3c00e12..0000000
--- a/releng/org.eclipse.emf.ecp.releng/src/org/eclipse/emf/ecp/releng/Dummy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Eike Stepper (Berlin, Germany) and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- *******************************************************************************/
-package org.eclipse.emf.ecp.releng;
-
-/**
- * @author Eike Stepper
- */
-public class Dummy {
-}
diff --git a/releng/org.eclipse.emf.ecp.releng/xsl/bom2bookmarks.xsl b/releng/org.eclipse.emf.ecp.releng/xsl/bom2bookmarks.xsl
deleted file mode 100644
index 06c422d..0000000
--- a/releng/org.eclipse.emf.ecp.releng/xsl/bom2bookmarks.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:md="http://www.eclipse.org/buckminster/MetaData-1.0" exclude-result-prefixes="md">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
-
- <xsl:template match="/">
- <xsl:apply-templates select="//md:resolution"/>
- </xsl:template>
-
- <xsl:template match="md:resolution">
- <site>
- <xsl:attribute name="url">
- <xsl:value-of select="@repository"/>
- </xsl:attribute>
- <xsl:attribute name="selected">true</xsl:attribute>
- <xsl:attribute name="name">
- <xsl:value-of select="@repository"/>
- </xsl:attribute>
- </site>
- </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.releng/xsl/content2categories.xsl b/releng/org.eclipse.emf.ecp.releng/xsl/content2categories.xsl
deleted file mode 100644
index 62d98ce..0000000
--- a/releng/org.eclipse.emf.ecp.releng/xsl/content2categories.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
-
- <xsl:template match="/">
- <repository name='ECP BUILD_QUALIFIER Categories'
- type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
- <properties size='2'>
- <property name='p2.timestamp' value='1307560601786'/>
- <property name='p2.compressed' value='true'/>
- </properties>
- <units size='1'>
- <unit id="ecp.BUILD_QUALIFIER" version="0.0.0">
- <properties size="2">
- <property name="org.eclipse.equinox.p2.name" value="ECP BUILD_QUALIFIER"/>
- <property name="org.eclipse.equinox.p2.type.category" value="true"/>
- </properties>
- <provides size="1">
- <provided namespace="org.eclipse.equinox.p2.iu" name="ecp.BUILD_QUALIFIER" version="0.0.0"/>
- </provides>
- <requires size="REQUIRES_SIZE">
- <xsl:apply-templates select="//property[@name='org.eclipse.equinox.p2.type.category']"/>
- </requires>
- <touchpoint id="null" version="0.0.0"/>
- </unit>
- </units>
- </repository>
- </xsl:template>
-
- <xsl:template match="property[../../@id!='Default']">
- <required namespace="org.eclipse.equinox.p2.iu">
- <xsl:attribute name="name">
- <xsl:value-of select="../../@id"/>
- </xsl:attribute>
- <xsl:attribute name="version">
- <xsl:value-of select="../../@version"/>
- </xsl:attribute>
- </required>
- </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.releng/xsl/content2html.xsl b/releng/org.eclipse.emf.ecp.releng/xsl/content2html.xsl
deleted file mode 100644
index 8b7f46d..0000000
--- a/releng/org.eclipse.emf.ecp.releng/xsl/content2html.xsl
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="html" omit-xml-declaration="yes" indent="yes"/>
- <xsl:strip-space elements="*"/>
-
- <xsl:template match="/">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <xsl:apply-templates select="repository"/>
- </html>
- </xsl:template>
-
- <xsl:template match="repository">
- <head>
- <title>
- <xsl:value-of select="@name"/>
- </title>
- </head>
- <body>
- <h1>
- <xsl:value-of select="@name"/>
- </h1>
- <p>
- <em>For information about CDO or Net4j, see their
- <a href="http://www.eclipse.org/cdo">homepage</a> or
- <a href="http://wiki.eclipse.org/CDO">wiki</a>.
- <br/> For information about installing or updating Eclipse software, see the
- <a
- href="http://help.eclipse.org/helios/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">
- Eclipse Platform Help</a>.
- <br/> Some plugins require third party software from p2 repositories listed in this
- <a href="bookmarks.xml">bookmarks.xml</a> file.</em>
-
- </p>
- <table border="0">
- <tr>
- <td colspan="2">
- <hr/>
- <h2>Features</h2>
- </td>
- </tr>
- <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- <tr>
- <td colspan="2">
- <hr/>
- <h2>Plugins</h2>
- </td>
- </tr>
- <xsl:apply-templates select="//provided[@namespace='osgi.bundle']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </table>
- </body>
- </xsl:template>
-
- <xsl:template match="provided">
- <tr>
- <td>
- <xsl:value-of select="@name"/>
- </td>
- <td>
- <xsl:value-of select="@version"/>
- </td>
- </tr>
- </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.ecp.releng/xsl/content2xml.xsl b/releng/org.eclipse.emf.ecp.releng/xsl/content2xml.xsl
deleted file mode 100644
index 40ba607..0000000
--- a/releng/org.eclipse.emf.ecp.releng/xsl/content2xml.xsl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:template match="/">
- <xsl:apply-templates select="repository"/>
- </xsl:template>
-
- <xsl:template match="repository">
- <release tag="" integration="true">
- <xsl:attribute name="repository">
- <xsl:value-of select="@name"/>
- </xsl:attribute>
- <xsl:apply-templates select="//provided[@namespace='org.eclipse.update.feature']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- <xsl:apply-templates select="//provided[@namespace='osgi.bundle']">
- <xsl:sort select="@name"/>
- </xsl:apply-templates>
- </release>
- </xsl:template>
-
- <xsl:template match="provided">
- <element>
- <xsl:attribute name="name">
- <xsl:value-of select="@name"/>
- </xsl:attribute>
- <xsl:attribute name="version">
- <xsl:value-of select="@version"/>
- </xsl:attribute>
- <xsl:attribute name="type">
- <xsl:value-of select="@namespace"/>
- </xsl:attribute>
- </element>
- </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/ECPQ7Tests/context/ImportWorkspaceProjectWithLeague.ctx b/tests/ECPQ7Tests/context/ImportWorkspaceProjectWithLeague.ctx
index 2296868..9c1009c 100644
--- a/tests/ECPQ7Tests/context/ImportWorkspaceProjectWithLeague.ctx
+++ b/tests/ECPQ7Tests/context/ImportWorkspaceProjectWithLeague.ctx
@@ -6,7 +6,7 @@
Element-Type: context
Element-Version: 2.0
Id: _7kKq0KEjEeKX8e34E6tWIg
-Save-Time: 4/9/13 5:01 PM
+Save-Time: 6/22/13 3:05 PM
------=_.ecl.context-718f04b4-ed39-33e3-af62-0995e4561998
Content-Type: text/ecl
@@ -14,7 +14,7 @@
get-view "Model Explorer" | get-tree | get-menu "Create new project" | click
with [get-window "Create Project"] {
- get-combo -after [get-label "Provider:"] | select "Eclipse Workspace"
+ get-combo -after [get-label "Provider:"] | select "Eclipse Workspace (Experimental)"
}
with [get-window "Create Project"] {
get-button "Import existing XMI-File" | click
diff --git a/tests/ECPQ7Tests/emfstore/DeleteProjectOnServer.test b/tests/ECPQ7Tests/emfstore/DeleteProjectOnServer.test
index 45b7e64..c681e3c 100644
--- a/tests/ECPQ7Tests/emfstore/DeleteProjectOnServer.test
+++ b/tests/ECPQ7Tests/emfstore/DeleteProjectOnServer.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _FBwnwG69EeKbTKOCBYPcow
-Save-Time: 5/28/13 12:06 PM
+Save-Time: 6/26/13 5:18 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -22,9 +22,5 @@
get-window Confirmation | get-button Yes | click
get-view "Model Repositories" | get-tree | get-item "Local EMFStore" | get-property childCount | equals 0 | verify-true
get-view "Model Explorer" | get-tree | select "TestProject \\[trunk, Version 0\\]"
-with [get-view "Model Explorer" | get-tree] {
- get-menu Share | get-property enablement | equals true | verify-true
- get-menu Commit | get-property enablement | equals false | verify-true
- get-menu Update | get-property enablement | equals false | verify-true
-}
+
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/ECPQ7Tests/emfstore/Unset.test b/tests/ECPQ7Tests/emfstore/Unset.test
index b4618a0..ce0f9e7 100644
--- a/tests/ECPQ7Tests/emfstore/Unset.test
+++ b/tests/ECPQ7Tests/emfstore/Unset.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _IDNr4LZhEeKIbujrltRAUA
-Save-Time: 5/16/13 9:43 PM
+Save-Time: 6/27/13 12:09 PM
Tags: skipExecution
Testcase-Type: ecl
@@ -142,25 +142,11 @@
get-button "The Has Season Ticket of the Fan" | get-property selected | equals false | verify-true
get-button "Unset boolean" | get-property tooltip | equals "Unset boolean" | verify-true
get-button Unset | get-property tooltip | equals Unset | verify-true
- with [get-control Any -index 59] {
- get-property enablement | equals true | verify-true
- get-property containMenu | equals false | verify-true
- get-property borderWith | equals 0 | verify-true
- get-property backgroundColor | equals "#FFFFFF" | verify-true
- get-property foregroundColor | equals "#000000" | verify-true
- }
get-combo -after [get-label Gender] | get-property selection | equals Female | verify-true
get-button "Unset value" | get-property tooltip | equals "Unset value" | verify-true
get-button "Unset Link" | get-property tooltip | equals "Unset Link" | verify-true
get-label "(Not Set)" | get-property caption | equals "(Not Set)" | verify-true
get-button Unset -after [get-label "Visited Tournaments"] | get-property tooltip | equals Unset | verify-true
- with [get-control Any -index 95] {
- get-property enablement | equals true | verify-true
- get-property containMenu | equals false | verify-true
- get-property borderWith | equals 0 | verify-true
- get-property backgroundColor | equals "#FFFFFF" | verify-true
- get-property foregroundColor | equals "#000000" | verify-true
- }
get-editbox -after [get-label "Number Of Tournaments Visited"] | get-property text | equals 0 | verify-true
get-button "Unset number" | get-property tooltip | equals "Unset number" | verify-true
get-editbox -after [get-label "Money Spent On Tickets"] | get-property text | equals "0" | verify-true
diff --git a/tests/ECPQ7Tests/file/CreateFileProject.test b/tests/ECPQ7Tests/file/CreateFileProject.test
index 50f39da..6e8d254 100644
--- a/tests/ECPQ7Tests/file/CreateFileProject.test
+++ b/tests/ECPQ7Tests/file/CreateFileProject.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _r0W08KEhEeKX8e34E6tWIg
-Save-Time: 4/9/13 4:32 PM
+Save-Time: 6/22/13 3:07 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -17,7 +17,7 @@
get-view "Model Explorer" | get-tree | get-property itemCount | equals 0 | verify-true
get-view "Model Explorer" | get-tree | get-menu "Create new project" | click
with [get-window "Create Project"] {
- get-combo -after [get-label "Provider:"] | select "Eclipse Workspace"
+ get-combo -after [get-label "Provider:"] | select "Eclipse Workspace (Experimental)"
get-editbox -after [get-label "Project Name:"] | set-text TestProject
}
set-dialog-result File "platform:/resource/TestProject.xmi"
diff --git a/tests/ECPQ7Tests/file/CreateWorkspaceProject.test b/tests/ECPQ7Tests/file/CreateWorkspaceProject.test
index 38825d1..781541e 100644
--- a/tests/ECPQ7Tests/file/CreateWorkspaceProject.test
+++ b/tests/ECPQ7Tests/file/CreateWorkspaceProject.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _zKqbgKEeEeKX8e34E6tWIg
-Save-Time: 4/9/13 4:20 PM
+Save-Time: 6/22/13 3:06 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -19,7 +19,7 @@
}
get-view "Model Explorer" | get-tree | get-menu "Create new project" | click
with [get-window "Create Project"] {
- get-combo -after [get-label "Provider:"] | select "Eclipse Workspace"
+ get-combo -after [get-label "Provider:"] | select "Eclipse Workspace (Experimental)"
get-editbox -after [get-label "Project Name:"] | set-text TestProject
}
with [get-window "Create Project"] {
diff --git a/tests/ECPQ7Tests/file/DeleteAndLoadWorkspaceProject.test b/tests/ECPQ7Tests/file/DeleteAndLoadWorkspaceProject.test
index 4dc29fb..805c544 100644
--- a/tests/ECPQ7Tests/file/DeleteAndLoadWorkspaceProject.test
+++ b/tests/ECPQ7Tests/file/DeleteAndLoadWorkspaceProject.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _FNv6kKEsEeKX8e34E6tWIg
-Save-Time: 4/9/13 5:44 PM
+Save-Time: 6/22/13 3:08 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -20,7 +20,7 @@
get-view "Model Explorer" | get-tree | get-property itemCount | equals 0 | verify-true
get-view "Model Explorer" | get-tree | get-menu "Create new project" | click
with [get-window "Create Project"] {
- get-combo -after [get-label "Provider:"] | select "Eclipse Workspace"
+ get-combo -after [get-label "Provider:"] | select "Eclipse Workspace (Experimental)"
get-button "Import existing XMI-File" | click
get-button "Browse Workspace ..." | click
get-window "Select XMI" | get-tree | select "TestProject/testProject.xmi" | double-click
diff --git a/tests/ECPQ7Tests/file/FileProviderSuite.suite b/tests/ECPQ7Tests/file/FileProviderSuite.suite
deleted file mode 100644
index 69455a0..0000000
--- a/tests/ECPQ7Tests/file/FileProviderSuite.suite
+++ /dev/null
@@ -1,20 +0,0 @@
---- Q7 testcase ---
-Format-Version: 1.0
-Q7-vendor: www.xored.com/q7
-Element-Name: FileProviderSuite
-Element-Type: testsuite
-Element-Version: 2.0
-Id: _rRvXcaEeEeKX8e34E6tWIg
-Save-Time: 4/9/13 4:45 PM
-
-------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
-Content-Type: text/testcase
-Entry-Name: testcase-items
-
-_r0W08KEhEeKX8e34E6tWIg // kind: 'test' name: 'CreateFileProject' path: 'CreateFileProject.test'
-_zKqbgKEeEeKX8e34E6tWIg // kind: 'test' name: 'CreateWorkspaceProject' path: 'CreateWorkspaceProject.test'
-_HZ-QoKEjEeKX8e34E6tWIg // kind: 'test' name: 'CheckFileProviderContextMenu' path: 'CheckFileProviderContextMenu.test'
-_5xu5UKEiEeKX8e34E6tWIg // kind: 'test' name: 'DeleteWorkspaceProject' path: 'DeleteWorkspaceProject.test'
-_WC_IcKEjEeKX8e34E6tWIg // kind: 'test' name: 'ImportFromExistingWorkspace' path: 'ImportFromExistingWorkspace.test'
-
-------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/ECPQ7Tests/file/ImportFromExistingWorkspace.test b/tests/ECPQ7Tests/file/ImportFromExistingWorkspace.test
index 0cad24c..43bc222 100644
--- a/tests/ECPQ7Tests/file/ImportFromExistingWorkspace.test
+++ b/tests/ECPQ7Tests/file/ImportFromExistingWorkspace.test
@@ -7,7 +7,7 @@
Element-Version: 3.0
External-Reference:
Id: _WC_IcKEjEeKX8e34E6tWIg
-Save-Time: 4/26/13 6:00 PM
+Save-Time: 6/22/13 3:08 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -16,7 +16,7 @@
get-view "Model Explorer" | get-tree | get-menu "Create new project" | click
with [get-window "Create Project"] {
- get-combo -after [get-label "Provider:"] | select "Eclipse Workspace"
+ get-combo -after [get-label "Provider:"] | select "Eclipse Workspace (Experimental)"
}
get-window "Create Project" | get-control Any -index 17 | get-property "getChildren().length" | equals 10 | verify-true
with [get-window "Create Project"] {
diff --git a/tests/ECPQ7Tests/pom.xml b/tests/ECPQ7Tests/pom.xml
index af75933..aaaab00 100644
--- a/tests/ECPQ7Tests/pom.xml
+++ b/tests/ECPQ7Tests/pom.xml
@@ -24,7 +24,7 @@
<q7-maven-version>1.2.19</q7-maven-version>
<q7-runner-version>1.2.19</q7-runner-version>
<q7-client-version>1.2.19</q7-client-version>
- <aut-base-path>https://hudson.eclipse.org/hudson/job/emf-emfclient-maintenance/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.ecp.products/target/products</aut-base-path>
+ <aut-base-path>https://hudson.eclipse.org/hudson/job/emf-emfclient-integration/lastSuccessfulBuild/artifact/releng/org.eclipse.emf.ecp.products/target/products</aut-base-path>
</properties>
<profiles>
diff --git a/tests/org.eclipse.emf.ecp.core.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.ecp.core.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.core.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.emf.ecp.core.test/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emf.ecp.core.test/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.core.test/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.core.test/META-INF/MANIFEST.MF
index 7c3f8dc..a1ba6e7 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.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.ecp.core.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.emf.ecp.core;bundle-version="1.0.0",
- org.junit4;bundle-version="4.8.1",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="1.0.0"
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="1.0.0",
+ org.junit;bundle-version="4.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.ecp.core.test;version="1.0.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.ecp.core.test/pom.xml b/tests/org.eclipse.emf.ecp.core.test/pom.xml
index ce05282..26ed432 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.core.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.ecp.validation.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..4824b80
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.validation.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.emf.ecp.validation.test/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emf.ecp.validation.test/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/tests/org.eclipse.emf.ecp.validation.test/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.ecp.validation.test/META-INF/MANIFEST.MF
index 7985e48..69eff13 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,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.ecp.validation.test;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.emf.ecp.validation.test/pom.xml b/tests/org.eclipse.emf.ecp.validation.test/pom.xml
index f8bf2c8..722bbcc 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-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.ecp.releng/</relativePath>
</parent>
<groupId>org.eclipse.emf.ecp</groupId>
<artifactId>org.eclipse.emf.ecp.validation.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.ecp.validation.test/src/org/eclipse/emf/ecp/validation/test/ValidationTest.java b/tests/org.eclipse.emf.ecp.validation.test/src/org/eclipse/emf/ecp/validation/test/ValidationTest.java
index 6645fb5..f694561 100644
--- a/tests/org.eclipse.emf.ecp.validation.test/src/org/eclipse/emf/ecp/validation/test/ValidationTest.java
+++ b/tests/org.eclipse.emf.ecp.validation.test/src/org/eclipse/emf/ecp/validation/test/ValidationTest.java
@@ -101,7 +101,7 @@
Writer writer3 = TestFactory.eINSTANCE.createWriter();
Library lib = TestFactory.eINSTANCE.createLibrary();
- lib.setName("Bücherei");
+ lib.setName("Bücherei");
lib.getWriters().add(writer1);
lib.getWriters().add(writer2);
lib.getWriters().add(writer3);
