Merge branch '13x'
diff --git a/builds/org.eclipse.emf.edapt.releng.p2/pom.xml b/builds/org.eclipse.emf.edapt.releng.p2/pom.xml
index d27c17a..db7dfd7 100644
--- a/builds/org.eclipse.emf.edapt.releng.p2/pom.xml
+++ b/builds/org.eclipse.emf.edapt.releng.p2/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<relativePath>../org.eclipse.emf.edapt.releng</relativePath>
</parent>
<groupId>org.eclipse.emf.edapt.releng.p2</groupId>
diff --git a/builds/org.eclipse.emf.edapt.releng.target/pom.xml b/builds/org.eclipse.emf.edapt.releng.target/pom.xml
index 973c989..5e904eb 100644
--- a/builds/org.eclipse.emf.edapt.releng.target/pom.xml
+++ b/builds/org.eclipse.emf.edapt.releng.target/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<relativePath>../org.eclipse.emf.edapt.releng</relativePath>
</parent>
<packaging>eclipse-target-definition</packaging>
diff --git a/builds/org.eclipse.emf.edapt.releng/pom.xml b/builds/org.eclipse.emf.edapt.releng/pom.xml
index 5c09c3c..fbcada1 100644
--- a/builds/org.eclipse.emf.edapt.releng/pom.xml
+++ b/builds/org.eclipse.emf.edapt.releng/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edapt</groupId>
<artifactId>root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -14,7 +14,7 @@
<maven-surefire-version>2.18.1</maven-surefire-version>
<junit-version>4.12</junit-version>
<javadoc-version>2.10.3</javadoc-version>
- <javadoc-title>Edapt 1.3.0 API</javadoc-title>
+ <javadoc-title>Edapt 1.3.1 API</javadoc-title>
</properties>
<profiles>
@@ -114,6 +114,7 @@
<show>protected</show>
<show>public</show>
<nohelp>true</nohelp>
+ <failOnError>false</failOnError>
<excludePackageNames>*.test.*:*.tests.*:*.library.*:*.statemachine.*</excludePackageNames>
</configuration>
</plugin>
diff --git a/examples/library.edit/META-INF/MANIFEST.MF b/examples/library.edit/META-INF/MANIFEST.MF
index d1cf422..e4aca0f 100644
--- a/examples/library.edit/META-INF/MANIFEST.MF
+++ b/examples/library.edit/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@
library;visibility:=reexport,
org.eclipse.emf.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: library.edit
diff --git a/examples/library.editor/META-INF/MANIFEST.MF b/examples/library.editor/META-INF/MANIFEST.MF
index 6338a7d..6bcf724 100644
--- a/examples/library.editor/META-INF/MANIFEST.MF
+++ b/examples/library.editor/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@
org.eclipse.emf.edit.ui;visibility:=reexport,
org.eclipse.ui.ide;visibility:=reexport
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: library.editor
diff --git a/examples/library/META-INF/MANIFEST.MF b/examples/library/META-INF/MANIFEST.MF
index b7d729a..ef084a5 100644
--- a/examples/library/META-INF/MANIFEST.MF
+++ b/examples/library/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.edapt.history;bundle-version="0.3.0";visibility:=reexport
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: library
diff --git a/examples/statemachine_ecoop.edit/META-INF/MANIFEST.MF b/examples/statemachine_ecoop.edit/META-INF/MANIFEST.MF
index 03c75ff..a3955c0 100644
--- a/examples/statemachine_ecoop.edit/META-INF/MANIFEST.MF
+++ b/examples/statemachine_ecoop.edit/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@
org.eclipse.emf.edit;visibility:=reexport
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: statemachine_ecoop.edit
diff --git a/examples/statemachine_ecoop.editor/META-INF/MANIFEST.MF b/examples/statemachine_ecoop.editor/META-INF/MANIFEST.MF
index 94d096d..3299b7c 100644
--- a/examples/statemachine_ecoop.editor/META-INF/MANIFEST.MF
+++ b/examples/statemachine_ecoop.editor/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@
org.eclipse.emf.edapt.migration.ui;bundle-version="0.3.0"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: statemachine_ecoop.editor
diff --git a/examples/statemachine_ecoop/META-INF/MANIFEST.MF b/examples/statemachine_ecoop/META-INF/MANIFEST.MF
index 1124fa4..6a974a0 100644
--- a/examples/statemachine_ecoop/META-INF/MANIFEST.MF
+++ b/examples/statemachine_ecoop/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@
org.eclipse.emf.edapt.history;bundle-version="0.3.0"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: statemachine_ecoop
diff --git a/examples/ttc_gmf/META-INF/MANIFEST.MF b/examples/ttc_gmf/META-INF/MANIFEST.MF
index 72bfa27..3d7f845 100644
--- a/examples/ttc_gmf/META-INF/MANIFEST.MF
+++ b/examples/ttc_gmf/META-INF/MANIFEST.MF
@@ -5,3 +5,4 @@
Bundle-Version: 0.1.0
Require-Bundle: org.eclipse.emf.ecore,
org.eclipse.emf.edapt.history;bundle-version="0.3.0"
+Automatic-Module-Name: ttc_gmf
diff --git a/examples/ttc_helloworld/META-INF/MANIFEST.MF b/examples/ttc_helloworld/META-INF/MANIFEST.MF
index 639d8aa..643dbf5 100644
--- a/examples/ttc_helloworld/META-INF/MANIFEST.MF
+++ b/examples/ttc_helloworld/META-INF/MANIFEST.MF
@@ -6,3 +6,4 @@
Require-Bundle: org.eclipse.emf.ecore,
org.eclipse.emf.edapt.migration;bundle-version="0.3.0",
org.eclipse.emf.edapt.history;bundle-version="0.3.0"
+Automatic-Module-Name: ttc_helloworld
diff --git a/examples/ttc_reengineering/META-INF/MANIFEST.MF b/examples/ttc_reengineering/META-INF/MANIFEST.MF
index 3a8f42f..07dc847 100644
--- a/examples/ttc_reengineering/META-INF/MANIFEST.MF
+++ b/examples/ttc_reengineering/META-INF/MANIFEST.MF
@@ -6,3 +6,4 @@
Require-Bundle: org.eclipse.emf.ecore,
org.eclipse.emf.edapt.migration,
org.eclipse.emf.edapt.history
+Automatic-Module-Name: ttc_reengineering
diff --git a/features/org.eclipse.emf.edapt.recorder.feature/feature.xml b/features/org.eclipse.emf.edapt.recorder.feature/feature.xml
index 770e2d0..2dc003a 100644
--- a/features/org.eclipse.emf.edapt.recorder.feature/feature.xml
+++ b/features/org.eclipse.emf.edapt.recorder.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.edapt.recorder.feature"
label="Edapt Recorder Feature"
- version="1.3.0.qualifier"
+ version="1.3.1.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://www.eclipse.org/edapt">
diff --git a/features/org.eclipse.emf.edapt.recorder.feature/pom.xml b/features/org.eclipse.emf.edapt.recorder.feature/pom.xml
index 17934ef..8a25b60 100644
--- a/features/org.eclipse.emf.edapt.recorder.feature/pom.xml
+++ b/features/org.eclipse.emf.edapt.recorder.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.recorder.feature</artifactId>
diff --git a/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml b/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml
index 44371f1..09905e0 100644
--- a/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml
+++ b/features/org.eclipse.emf.edapt.runtime.cdo.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.edapt.runtime.cdo.feature"
label="Edapt CDO Feature"
- version="1.3.0.qualifier"
+ version="1.3.1.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://www.eclipse.org/edapt">
diff --git a/features/org.eclipse.emf.edapt.runtime.cdo.feature/pom.xml b/features/org.eclipse.emf.edapt.runtime.cdo.feature/pom.xml
index f9ae376..e42ea98 100644
--- a/features/org.eclipse.emf.edapt.runtime.cdo.feature/pom.xml
+++ b/features/org.eclipse.emf.edapt.runtime.cdo.feature/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.runtime.cdo.feature</artifactId>
diff --git a/features/org.eclipse.emf.edapt.runtime.feature/feature.xml b/features/org.eclipse.emf.edapt.runtime.feature/feature.xml
index bf04151..15d8647 100644
--- a/features/org.eclipse.emf.edapt.runtime.feature/feature.xml
+++ b/features/org.eclipse.emf.edapt.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.edapt.runtime.feature"
label="Edapt Runtime Feature"
- version="1.3.0.qualifier"
+ version="1.3.1.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://www.eclipse.org/edapt">
diff --git a/features/org.eclipse.emf.edapt.runtime.feature/pom.xml b/features/org.eclipse.emf.edapt.runtime.feature/pom.xml
index 205237b..d5624fc 100644
--- a/features/org.eclipse.emf.edapt.runtime.feature/pom.xml
+++ b/features/org.eclipse.emf.edapt.runtime.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.runtime.feature</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index 1148afd..76e9fb6 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<relativePath>../builds/org.eclipse.emf.edapt.releng</relativePath>
</parent>
diff --git a/plugins/org.eclipse.emf.edapt.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.common.ui/META-INF/MANIFEST.MF
index 6c190b6..7631940 100644
--- a/plugins/org.eclipse.emf.edapt.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.common.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.common.ui
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Activator: org.eclipse.emf.edapt.common.ui.CommonUIActivator
Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore.editor;bundle-version="2.7.0";visibility:=reexport,
- org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.common.ui;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.editor,org.eclipse.emf.edapt.migration.ui"
+Export-Package: org.eclipse.emf.edapt.common.ui;version="1.3.1";x-friends:="org.eclipse.emf.edapt.history.editor,org.eclipse.emf.edapt.migration.ui"
Bundle-Vendor: %providerName
Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.emf.edapt.common.ui
diff --git a/plugins/org.eclipse.emf.edapt.common.ui/pom.xml b/plugins/org.eclipse.emf.edapt.common.ui/pom.xml
index a80af03..866be31 100644
--- a/plugins/org.eclipse.emf.edapt.common.ui/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.common.ui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.common.ui</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.common/META-INF/MANIFEST.MF
index 37b5204..b0d4360 100644
--- a/plugins/org.eclipse.emf.edapt.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.common
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Activator: org.eclipse.emf.edapt.internal.common.CommonActivator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
@@ -10,8 +10,18 @@
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.edapt.common;version="1.3.0",
- org.eclipse.emf.edapt.internal.common;version="1.3.0";x-friends:="org.eclipse.emf.edapt.common.ui, org.eclipse.emf.edapt.declaration, org.eclipse.emf.edapt.history, org.eclipse.emf.edapt.history.cdo, org.eclipse.emf.edapt.history.edit, org.eclipse.emf.edapt.history.editor, org.eclipse.emf.edapt.migration, org.eclipse.emf.edapt.migration.test, org.eclipse.emf.edapt.migration.ui"
+Export-Package: org.eclipse.emf.edapt.common;version="1.3.1",
+ org.eclipse.emf.edapt.internal.common;version="1.3.1";
+ x-friends:="org.eclipse.emf.edapt.common.ui,
+ org.eclipse.emf.edapt.declaration,
+ org.eclipse.emf.edapt.history,
+ org.eclipse.emf.edapt.history.cdo,
+ org.eclipse.emf.edapt.history.edit,
+ org.eclipse.emf.edapt.history.editor,
+ org.eclipse.emf.edapt.migration,
+ org.eclipse.emf.edapt.migration.test,
+ org.eclipse.emf.edapt.migration.ui"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %providerName
Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.emf.edapt.common
diff --git a/plugins/org.eclipse.emf.edapt.common/pom.xml b/plugins/org.eclipse.emf.edapt.common/pom.xml
index 9b2f60b..abb19dd 100644
--- a/plugins/org.eclipse.emf.edapt.common/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.common/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.common</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.declaration.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.declaration.edit/META-INF/MANIFEST.MF
index 1363a9f..3ebc68a 100644
--- a/plugins/org.eclipse.emf.edapt.declaration.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.declaration.edit/META-INF/MANIFEST.MF
@@ -2,16 +2,20 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.declaration.edit;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.edapt.declaration.provider.DeclarationEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.declaration.provider;version="1.3.0";x-friends:="org.eclipse.emf.edapt.declaration.editor,org.eclipse.emf.edapt.history.edit,org.eclipse.emf.edapt.history.editor"
+Export-Package: org.eclipse.emf.edapt.declaration.provider;version="1.3.1";
+ x-friends:="org.eclipse.emf.edapt.declaration.editor,
+ org.eclipse.emf.edapt.history.edit,
+ org.eclipse.emf.edapt.history.editor"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.edapt.declaration;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.declaration;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.edapt.declaration.edit
diff --git a/plugins/org.eclipse.emf.edapt.declaration.edit/pom.xml b/plugins/org.eclipse.emf.edapt.declaration.edit/pom.xml
index eea9fd6..9b3cda5 100644
--- a/plugins/org.eclipse.emf.edapt.declaration.edit/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.declaration.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.declaration.edit</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.declaration.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.declaration.editor/META-INF/MANIFEST.MF
index 68f76bc..72e2a49 100644
--- a/plugins/org.eclipse.emf.edapt.declaration.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.declaration.editor/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.declaration.editor;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.edapt.declaration.presentation.DeclarationEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.declaration.presentation;version="1.3.0";x-internal:=true;
+Export-Package: org.eclipse.emf.edapt.declaration.presentation;version="1.3.1";x-internal:=true;
uses:="org.eclipse.jface.wizard,
org.eclipse.core.runtime,
org.eclipse.emf.edit.ui.provider,
@@ -37,9 +37,10 @@
org.eclipse.emf.common.ui"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.declaration.edit;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.declaration.edit;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.edapt.common.ui;bundle-version="[1.3.0,2.0.0)"
+ org.eclipse.emf.edapt.common.ui;bundle-version="[1.3.1,2.0.0)"
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.edapt.declaration.editor
diff --git a/plugins/org.eclipse.emf.edapt.declaration.editor/pom.xml b/plugins/org.eclipse.emf.edapt.declaration.editor/pom.xml
index 97413b6..3a60661 100644
--- a/plugins/org.eclipse.emf.edapt.declaration.editor/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.declaration.editor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.declaration.editor</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.declaration/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.declaration/META-INF/MANIFEST.MF
index 42916cd..f6aff29 100644
--- a/plugins/org.eclipse.emf.edapt.declaration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.declaration/META-INF/MANIFEST.MF
@@ -2,26 +2,31 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.declaration;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.declaration;version="1.3.0",
- org.eclipse.emf.edapt.declaration.common;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.creation;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.delegation;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.generalization;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.impl;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.inheritance;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.merge;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.replacement;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.simple;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.declaration.util;version="1.3.0";x-friends:="org.eclipse.emf.edapt.declaration.edit",
- org.eclipse.emf.edapt.internal.declaration;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history, org.eclipse.emf.edapt.history.cdo, org.eclipse.emf.edapt.history.edit, org.eclipse.emf.edapt.migration.ui"
+Export-Package: org.eclipse.emf.edapt.declaration;version="1.3.1",
+ org.eclipse.emf.edapt.declaration.common;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.creation;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.delegation;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.generalization;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.impl;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.inheritance;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.merge;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.replacement;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.simple;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.declaration.util;version="1.3.1";x-friends:="org.eclipse.emf.edapt.declaration.edit",
+ org.eclipse.emf.edapt.internal.declaration;version="1.3.1";
+ x-friends:="org.eclipse.emf.edapt.history,
+ org.eclipse.emf.edapt.history.cdo,
+ org.eclipse.emf.edapt.history.edit,
+ org.eclipse.emf.edapt.migration.ui"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.edapt.migration;bundle-version="[1.3.0,2.0.0)"
+ org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.emf.edapt.migration;bundle-version="[1.3.1,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.edapt.declaration.DeclarationPlugin$Implementation
+Automatic-Module-Name: org.eclipse.emf.edapt.declaration
diff --git a/plugins/org.eclipse.emf.edapt.declaration/pom.xml b/plugins/org.eclipse.emf.edapt.declaration/pom.xml
index ff139c1..daa4027 100644
--- a/plugins/org.eclipse.emf.edapt.declaration/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.declaration/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.declaration</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.history.cdo/META-INF/MANIFEST.MF
index 558b34d..50d7ec7 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.emf.edapt.history.cdo;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
@@ -10,5 +10,5 @@
org.eclipse.emf.cdo;bundle-version="[4.2.1,5.0.0)",
org.eclipse.emf.cdo.net4j;bundle-version="[4.1.101,5.0.0)",
org.eclipse.net4j.tcp;bundle-version="[4.1.100,5.0.0)"
-Export-Package: org.eclipse.emf.edapt.cdo.migration;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.cdo.migration.execution;version="1.3.0";x-internal:="true"
+Export-Package: org.eclipse.emf.edapt.cdo.migration;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.cdo.migration.execution;version="1.3.1";x-internal:=true
diff --git a/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml b/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml
index c03e199..2e2ba62 100644
--- a/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.history.cdo/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.history.cdo</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.history.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.history.edit/META-INF/MANIFEST.MF
index 72f8c7d..3a13c39 100644
--- a/plugins/org.eclipse.emf.edapt.history.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.history.edit/META-INF/MANIFEST.MF
@@ -2,24 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.history.edit;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.edapt.spi.history.provider.HistoryEditPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.history.instantiation;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.editor",
- org.eclipse.emf.edapt.history.provider.util;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.history.reconstruction;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.editor,org.eclipse.emf.edapt.migration.test",
- org.eclipse.emf.edapt.history.recorder;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.editor",
- org.eclipse.emf.edapt.spi.history.provider;version="1.3.0"
+Export-Package: org.eclipse.emf.edapt.history.instantiation;version="1.3.1";x-friends:="org.eclipse.emf.edapt.history.editor",
+ org.eclipse.emf.edapt.history.provider.util;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.history.reconstruction;version="1.3.1";x-friends:="org.eclipse.emf.edapt.history.editor,org.eclipse.emf.edapt.migration.test",
+ org.eclipse.emf.edapt.history.recorder;version="1.3.1";x-friends:="org.eclipse.emf.edapt.history.editor",
+ org.eclipse.emf.edapt.spi.history.provider;version="1.3.1"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.edapt.history;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.history;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.declaration;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.declaration.edit;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.declaration;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.declaration.edit;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)"
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.edapt.history.edit
diff --git a/plugins/org.eclipse.emf.edapt.history.edit/pom.xml b/plugins/org.eclipse.emf.edapt.history.edit/pom.xml
index d62f097..bbc4023 100644
--- a/plugins/org.eclipse.emf.edapt.history.edit/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.history.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.history.edit</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.history.edit/src/org/eclipse/emf/edapt/history/recorder/CommandStackListener.java b/plugins/org.eclipse.emf.edapt.history.edit/src/org/eclipse/emf/edapt/history/recorder/CommandStackListener.java
index 3b7bb75..33a1691 100644
--- a/plugins/org.eclipse.emf.edapt.history.edit/src/org/eclipse/emf/edapt/history/recorder/CommandStackListener.java
+++ b/plugins/org.eclipse.emf.edapt.history.edit/src/org/eclipse/emf/edapt/history/recorder/CommandStackListener.java
@@ -142,6 +142,9 @@
* not detached due to the save mechanism which reloads the metamodel.
*/
private boolean checkRecorder() {
+ if (metamodelRecorder == null || metamodelRecorder.getElements().isEmpty()) {
+ return false;
+ }
return !metamodelRecorder.getElements().get(0).eIsProxy();
}
diff --git a/plugins/org.eclipse.emf.edapt.history.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.history.editor/META-INF/MANIFEST.MF
index dc6edd9..ccf069b 100644
--- a/plugins/org.eclipse.emf.edapt.history.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.history.editor/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.history.editor;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.edapt.history.presentation.HistoryEditorPlugin$Implementation
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.history.instantiation.ui;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.history.presentation;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.history.presentation.action;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.history.reconstruction.ui;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.history.recorder.ui;version="1.3.0";x-internal:="true"
+Export-Package: org.eclipse.emf.edapt.history.instantiation.ui;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.history.presentation;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.history.presentation.action;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.history.reconstruction.ui;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.history.recorder.ui;version="1.3.1";x-internal:=true
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.edapt.history.edit;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.history.edit;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.common.ui;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emf.edapt.common.ui;bundle-version="[1.3.1,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
org.eclipse.jdt.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.7.0,4.0.0)",
@@ -25,3 +25,4 @@
org.eclipse.compare;bundle-version="[3.5.400,4.0.0)",
org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)"
Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.emf.edapt.history.editor
diff --git a/plugins/org.eclipse.emf.edapt.history.editor/generated-src/org/eclipse/emf/edapt/history/presentation/HistoryEditor.java b/plugins/org.eclipse.emf.edapt.history.editor/generated-src/org/eclipse/emf/edapt/history/presentation/HistoryEditor.java
index e9a5196..f552507 100644
--- a/plugins/org.eclipse.emf.edapt.history.editor/generated-src/org/eclipse/emf/edapt/history/presentation/HistoryEditor.java
+++ b/plugins/org.eclipse.emf.edapt.history.editor/generated-src/org/eclipse/emf/edapt/history/presentation/HistoryEditor.java
@@ -249,48 +249,45 @@
*
* @generated
*/
- protected IPartListener partListener =
- new IPartListener() {
- @Override
- public void partActivated(IWorkbenchPart p) {
- if (p instanceof ContentOutline) {
- if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
- getActionBarContributor().setActiveEditor(HistoryEditor.this);
+ protected IPartListener partListener = new IPartListener() {
+ @Override
+ public void partActivated(IWorkbenchPart p) {
+ if (p instanceof ContentOutline) {
+ if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
+ getActionBarContributor().setActiveEditor(HistoryEditor.this);
- setCurrentViewer(contentOutlineViewer);
- }
+ setCurrentViewer(contentOutlineViewer);
}
- else if (p instanceof PropertySheet) {
- if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {
- getActionBarContributor().setActiveEditor(HistoryEditor.this);
- handleActivate();
- }
- }
- else if (p == HistoryEditor.this) {
+ } else if (p instanceof PropertySheet) {
+ if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {
+ getActionBarContributor().setActiveEditor(HistoryEditor.this);
handleActivate();
}
+ } else if (p == HistoryEditor.this) {
+ handleActivate();
}
+ }
- @Override
- public void partBroughtToTop(IWorkbenchPart p) {
- // Ignore.
- }
+ @Override
+ public void partBroughtToTop(IWorkbenchPart p) {
+ // Ignore.
+ }
- @Override
- public void partClosed(IWorkbenchPart p) {
- // Ignore.
- }
+ @Override
+ public void partClosed(IWorkbenchPart p) {
+ // Ignore.
+ }
- @Override
- public void partDeactivated(IWorkbenchPart p) {
- // Ignore.
- }
+ @Override
+ public void partDeactivated(IWorkbenchPart p) {
+ // Ignore.
+ }
- @Override
- public void partOpened(IWorkbenchPart p) {
- // Ignore.
- }
- };
+ @Override
+ public void partOpened(IWorkbenchPart p) {
+ // Ignore.
+ }
+ };
/**
* Resources that have been removed since last activation.
@@ -344,52 +341,48 @@
*
* @generated
*/
- protected EContentAdapter problemIndicationAdapter =
- new EContentAdapter() {
- @Override
- public void notifyChanged(Notification notification) {
- if (notification.getNotifier() instanceof Resource) {
- switch (notification.getFeatureID(Resource.class)) {
- case Resource.RESOURCE__IS_LOADED:
- case Resource.RESOURCE__ERRORS:
- case Resource.RESOURCE__WARNINGS: {
- final Resource resource = (Resource) notification.getNotifier();
- final Diagnostic diagnostic = analyzeResourceProblems(resource, null);
- if (diagnostic.getSeverity() != Diagnostic.OK) {
- resourceToDiagnosticMap.put(resource, diagnostic);
- }
- else {
- resourceToDiagnosticMap.remove(resource);
- }
-
- if (updateProblemIndication) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- @Override
- public void run() {
- updateProblemIndication();
- }
- });
- }
- break;
+ protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {
+ @Override
+ public void notifyChanged(Notification notification) {
+ if (notification.getNotifier() instanceof Resource) {
+ switch (notification.getFeatureID(Resource.class)) {
+ case Resource.RESOURCE__IS_LOADED:
+ case Resource.RESOURCE__ERRORS:
+ case Resource.RESOURCE__WARNINGS: {
+ final Resource resource = (Resource) notification.getNotifier();
+ final Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ resourceToDiagnosticMap.put(resource, diagnostic);
+ } else {
+ resourceToDiagnosticMap.remove(resource);
}
+
+ if (updateProblemIndication) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ updateProblemIndication();
+ }
+ });
}
+ break;
}
- else {
- super.notifyChanged(notification);
}
+ } else {
+ super.notifyChanged(notification);
}
+ }
- @Override
- protected void setTarget(Resource target) {
- basicSetTarget(target);
- }
+ @Override
+ protected void setTarget(Resource target) {
+ basicSetTarget(target);
+ }
- @Override
- protected void unsetTarget(Resource target) {
- basicUnsetTarget(target);
- }
- };
+ @Override
+ protected void unsetTarget(Resource target) {
+ basicUnsetTarget(target);
+ }
+ };
/**
* This listens for workspace changes.
@@ -398,82 +391,77 @@
*
* @generated
*/
- protected IResourceChangeListener resourceChangeListener =
- new IResourceChangeListener() {
- @Override
- public void resourceChanged(IResourceChangeEvent event) {
- final IResourceDelta delta = event.getDelta();
- try {
- class ResourceDeltaVisitor implements IResourceDeltaVisitor {
- protected ResourceSet resourceSet = editingDomain.getResourceSet();
- protected Collection<Resource> changedResources = new ArrayList<Resource>();
- protected Collection<Resource> removedResources = new ArrayList<Resource>();
+ protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
+ @Override
+ public void resourceChanged(IResourceChangeEvent event) {
+ final IResourceDelta delta = event.getDelta();
+ try {
+ class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+ protected ResourceSet resourceSet = editingDomain.getResourceSet();
+ protected Collection<Resource> changedResources = new ArrayList<Resource>();
+ protected Collection<Resource> removedResources = new ArrayList<Resource>();
- @Override
- public boolean visit(IResourceDelta delta) {
- if (delta.getResource().getType() == IResource.FILE) {
- if (delta.getKind() == IResourceDelta.REMOVED ||
- delta.getKind() == IResourceDelta.CHANGED
+ @Override
+ public boolean visit(IResourceDelta delta) {
+ if (delta.getResource().getType() == IResource.FILE) {
+ if (delta.getKind() == IResourceDelta.REMOVED ||
+ delta.getKind() == IResourceDelta.CHANGED
&& delta.getFlags() != IResourceDelta.MARKERS) {
- final Resource resource = resourceSet.getResource(
- URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
- if (resource != null) {
- if (delta.getKind() == IResourceDelta.REMOVED) {
- removedResources.add(resource);
- }
- else if (!savedResources.remove(resource)) {
- changedResources.add(resource);
- }
+ final Resource resource = resourceSet.getResource(
+ URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+ if (resource != null) {
+ if (delta.getKind() == IResourceDelta.REMOVED) {
+ removedResources.add(resource);
+ } else if (!savedResources.remove(resource)) {
+ changedResources.add(resource);
}
}
}
-
- return true;
}
- public Collection<Resource> getChangedResources() {
- return changedResources;
- }
-
- public Collection<Resource> getRemovedResources() {
- return removedResources;
- }
+ return true;
}
- final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
- delta.accept(visitor);
-
- if (!visitor.getRemovedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- @Override
- public void run() {
- removedResources.addAll(visitor.getRemovedResources());
- if (!isDirty()) {
- getSite().getPage().closeEditor(HistoryEditor.this, false);
- }
- }
- });
+ public Collection<Resource> getChangedResources() {
+ return changedResources;
}
- if (!visitor.getChangedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- @Override
- public void run() {
- changedResources.addAll(visitor.getChangedResources());
- if (getSite().getPage().getActiveEditor() == HistoryEditor.this) {
- handleActivate();
- }
- }
- });
+ public Collection<Resource> getRemovedResources() {
+ return removedResources;
}
}
- catch (final CoreException exception) {
- HistoryEditorPlugin.INSTANCE.log(exception);
+
+ final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+ delta.accept(visitor);
+
+ if (!visitor.getRemovedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ removedResources.addAll(visitor.getRemovedResources());
+ if (!isDirty()) {
+ getSite().getPage().closeEditor(HistoryEditor.this, false);
+ }
+ }
+ });
}
+
+ if (!visitor.getChangedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ changedResources.addAll(visitor.getChangedResources());
+ if (getSite().getPage().getActiveEditor() == HistoryEditor.this) {
+ handleActivate();
+ }
+ }
+ });
+ }
+ } catch (final CoreException exception) {
+ HistoryEditorPlugin.INSTANCE.log(exception);
}
- };
+ }
+ };
/**
* Handles activation of the editor or it's associated views.
@@ -496,14 +484,12 @@
if (!removedResources.isEmpty()) {
if (handleDirtyConflict()) {
getSite().getPage().closeEditor(HistoryEditor.this, false);
- }
- else {
+ } else {
removedResources.clear();
changedResources.clear();
savedResources.clear();
}
- }
- else if (!changedResources.isEmpty()) {
+ } else if (!changedResources.isEmpty()) {
changedResources.removeAll(savedResources);
handleChangedResources();
changedResources.clear();
@@ -557,12 +543,11 @@
*/
protected void updateProblemIndication() {
if (updateProblemIndication) {
- final BasicDiagnostic diagnostic =
- new BasicDiagnostic
- (Diagnostic.OK, "org.eclipse.emf.edapt.history.editor", //$NON-NLS-1$
- 0,
- null,
- new Object[] { editingDomain.getResourceSet() });
+ final BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
+ "org.eclipse.emf.edapt.history.editor", //$NON-NLS-1$
+ 0,
+ null,
+ new Object[] { editingDomain.getResourceSet() });
for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
if (childDiagnostic.getSeverity() != Diagnostic.OK) {
diagnostic.add(childDiagnostic);
@@ -575,8 +560,7 @@
if (diagnostic.getSeverity() != Diagnostic.OK) {
setActivePage(lastEditorPage);
}
- }
- else if (diagnostic.getSeverity() != Diagnostic.OK) {
+ } else if (diagnostic.getSeverity() != Diagnostic.OK) {
final ProblemEditorPart problemEditorPart = new ProblemEditorPart();
problemEditorPart.setDiagnostic(diagnostic);
problemEditorPart.setMarkerHelper(markerHelper);
@@ -611,10 +595,9 @@
* @generated
*/
protected boolean handleDirtyConflict() {
- return MessageDialog.openQuestion
- (getSite().getShell(),
- getString("_UI_FileConflict_label"), //$NON-NLS-1$
- getString("_WARN_FileConflict")); //$NON-NLS-1$
+ return MessageDialog.openQuestion(getSite().getShell(),
+ getString("_UI_FileConflict_label"), //$NON-NLS-1$
+ getString("_WARN_FileConflict")); //$NON-NLS-1$
}
/**
@@ -654,30 +637,28 @@
// Add a listener to set the most recent command's affected objects to be the selection of the viewer with
// focus.
//
- commandStack.addCommandStackListener
- (new CommandStackListener() {
- @Override
- public void commandStackChanged(final EventObject event) {
- getContainer().getDisplay().asyncExec
- (new Runnable() {
- @Override
- public void run() {
- firePropertyChange(IEditorPart.PROP_DIRTY);
+ commandStack.addCommandStackListener(new CommandStackListener() {
+ @Override
+ public void commandStackChanged(final EventObject event) {
+ getContainer().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ firePropertyChange(IEditorPart.PROP_DIRTY);
- // Try to select the affected objects.
- //
- final Command mostRecentCommand = ((CommandStack) event.getSource())
- .getMostRecentCommand();
- if (mostRecentCommand != null) {
- setSelectionToViewer(mostRecentCommand.getAffectedObjects());
- }
- if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
- propertySheetPage.refresh();
- }
- }
- });
- }
- });
+ // Try to select the affected objects.
+ //
+ final Command mostRecentCommand = ((CommandStack) event.getSource())
+ .getMostRecentCommand();
+ if (mostRecentCommand != null) {
+ setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+ }
+ if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
+ propertySheetPage.refresh();
+ }
+ }
+ });
+ }
+ });
// Create the editing domain with a special command stack.
//
@@ -708,17 +689,16 @@
// Make sure it's okay.
//
if (theSelection != null && !theSelection.isEmpty()) {
- final Runnable runnable =
- new Runnable() {
- @Override
- public void run() {
- // Try to select the items in the current content viewer of the editor.
- //
- if (currentViewer != null) {
- currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
- }
+ final Runnable runnable = new Runnable() {
+ @Override
+ public void run() {
+ // Try to select the items in the current content viewer of the editor.
+ //
+ if (currentViewer != null) {
+ currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
}
- };
+ }
+ };
getSite().getShell().getDisplay().asyncExec(runnable);
}
}
@@ -817,15 +797,14 @@
if (selectionChangedListener == null) {
// Create the listener on demand.
//
- selectionChangedListener =
- new ISelectionChangedListener() {
- // This just notifies those things that are affected by the section.
- //
- @Override
- public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
- setSelection(selectionChangedEvent.getSelection());
- }
- };
+ selectionChangedListener = new ISelectionChangedListener() {
+ // This just notifies those things that are affected by the section.
+ //
+ @Override
+ public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+ setSelection(selectionChangedEvent.getSelection());
+ }
+ };
}
// Stop listening to the old one.
@@ -921,22 +900,19 @@
*/
public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
- final BasicDiagnostic basicDiagnostic =
- new BasicDiagnostic
- (Diagnostic.ERROR, "org.eclipse.emf.edapt.history.editor", //$NON-NLS-1$
- 0,
- getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
- new Object[] { exception == null ? (Object) resource : exception });
+ final BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
+ "org.eclipse.emf.edapt.history.editor", //$NON-NLS-1$
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+ new Object[] { exception == null ? (Object) resource : exception });
basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
return basicDiagnostic;
- }
- else if (exception != null) {
+ } else if (exception != null) {
return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.edapt.history.editor", //$NON-NLS-1$
0,
getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
new Object[] { exception });
- }
- else {
+ } else {
return Diagnostic.OK_INSTANCE;
}
}
@@ -975,39 +951,38 @@
final int pageIndex = addPage(tree);
setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- @Override
- public void run() {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ if (getPageCount() > 0) {
setActivePage(0);
}
- });
+ }
+ });
}
// Ensures that this editor will only display the page's tab
// area if there are more than one page
//
- getContainer().addControlListener
- (new ControlAdapter() {
- boolean guard = false;
+ getContainer().addControlListener(new ControlAdapter() {
+ boolean guard = false;
- @Override
- public void controlResized(ControlEvent event) {
- if (!guard) {
- guard = true;
- hideTabs();
- guard = false;
- }
+ @Override
+ public void controlResized(ControlEvent event) {
+ if (!guard) {
+ guard = true;
+ hideTabs();
+ guard = false;
}
- });
+ }
+ });
- getSite().getShell().getDisplay().asyncExec
- (new Runnable() {
- @Override
- public void run() {
- updateProblemIndication();
- }
- });
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ updateProblemIndication();
+ }
+ });
}
/**
@@ -1075,14 +1050,11 @@
public Object getAdapter(Class key) {
if (key.equals(IContentOutlinePage.class)) {
return showOutlineView() ? getContentOutlinePage() : null;
- }
- else if (key.equals(IPropertySheetPage.class)) {
+ } else if (key.equals(IPropertySheetPage.class)) {
return getPropertySheetPage();
- }
- else if (key.equals(IGotoMarker.class)) {
+ } else if (key.equals(IGotoMarker.class)) {
return this;
- }
- else {
+ } else {
return super.getAdapter(key);
}
}
@@ -1141,15 +1113,14 @@
// Listen to selection so that we can handle it is a special way.
//
- contentOutlinePage.addSelectionChangedListener
- (new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- //
- @Override
- public void selectionChanged(SelectionChangedEvent event) {
- handleContentOutlineSelection(event.getSelection());
- }
- });
+ contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {
+ // This ensures that we handle selections correctly.
+ //
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleContentOutlineSelection(event.getSelection());
+ }
+ });
}
return contentOutlinePage;
@@ -1164,20 +1135,19 @@
*/
public IPropertySheetPage getPropertySheetPage() {
if (propertySheetPage == null) {
- propertySheetPage =
- new ExtendedPropertySheetPage(editingDomain) {
- @Override
- public void setSelectionToViewer(List<?> selection) {
- HistoryEditor.this.setSelectionToViewer(selection);
- HistoryEditor.this.setFocus();
- }
+ propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
+ @Override
+ public void setSelectionToViewer(List<?> selection) {
+ HistoryEditor.this.setSelectionToViewer(selection);
+ HistoryEditor.this.setFocus();
+ }
- @Override
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- };
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
}
@@ -1240,33 +1210,31 @@
// Do the work within an operation because this is a long running activity that modifies the workbench.
//
- final WorkspaceModifyOperation operation =
- new WorkspaceModifyOperation() {
- // This is the method that gets invoked when the operation runs.
+ final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+ // This is the method that gets invoked when the operation runs.
+ //
+ @Override
+ public void execute(IProgressMonitor monitor) {
+ // Save the resources to the file system.
//
- @Override
- public void execute(IProgressMonitor monitor) {
- // Save the resources to the file system.
- //
- boolean first = true;
- for (final Resource resource : editingDomain.getResourceSet().getResources()) {
- if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
- && !editingDomain.isReadOnly(resource)) {
- try {
- final long timeStamp = resource.getTimeStamp();
- resource.save(saveOptions);
- if (resource.getTimeStamp() != timeStamp) {
- savedResources.add(resource);
- }
+ boolean first = true;
+ for (final Resource resource : editingDomain.getResourceSet().getResources()) {
+ if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
+ && !editingDomain.isReadOnly(resource)) {
+ try {
+ final long timeStamp = resource.getTimeStamp();
+ resource.save(saveOptions);
+ if (resource.getTimeStamp() != timeStamp) {
+ savedResources.add(resource);
}
- catch (final Exception exception) {
- resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
- }
- first = false;
+ } catch (final Exception exception) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
+ first = false;
}
}
- };
+ }
+ };
updateProblemIndication = false;
try {
@@ -1352,10 +1320,9 @@
editingDomain.getResourceSet().getResources().get(0).setURI(uri);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
- final IProgressMonitor progressMonitor =
- getActionBars().getStatusLineManager() != null ?
- getActionBars().getStatusLineManager().getProgressMonitor() :
- new NullProgressMonitor();
+ final IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+ ? getActionBars().getStatusLineManager().getProgressMonitor()
+ : new NullProgressMonitor();
doSave(progressMonitor);
}
@@ -1473,8 +1440,9 @@
* @generated
*/
public void setStatusLineManager(ISelection selection) {
- final IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
- contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+ final IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+ ? contentOutlineStatusLineManager
+ : getActionBars().getStatusLineManager();
if (statusLineManager != null) {
if (selection instanceof IStructuredSelection) {
@@ -1496,8 +1464,7 @@
break;
}
}
- }
- else {
+ } else {
statusLineManager.setMessage(""); //$NON-NLS-1$
}
}
diff --git a/plugins/org.eclipse.emf.edapt.history.editor/pom.xml b/plugins/org.eclipse.emf.edapt.history.editor/pom.xml
index 18c9929..3e38941 100644
--- a/plugins/org.eclipse.emf.edapt.history.editor/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.history.editor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.history.editor</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.history/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.history/META-INF/MANIFEST.MF
index 49f63dd..32aa9eb 100644
--- a/plugins/org.eclipse.emf.edapt.history/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.history/META-INF/MANIFEST.MF
@@ -2,25 +2,38 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.history;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.history.reconstruction;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.cdo,org.eclipse.emf.edapt.history.edit,org.eclipse.emf.edapt.history.editor",
- org.eclipse.emf.edapt.history.recorder;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.edit",
- org.eclipse.emf.edapt.history.util;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.cdo, org.eclipse.emf.edapt.history.edit, org.eclipse.emf.edapt.history.editor, org.eclipse.emf.edapt.migration.test, org.eclipse.emf.edapt.migration.ui",
- org.eclipse.emf.edapt.internal.migration.execution;version="1.3.0",
- org.eclipse.emf.edapt.internal.migration.execution.internal;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history.cdo, org.eclipse.emf.edapt.history.edit, org.eclipse.emf.edapt.history.editor, org.eclipse.emf.edapt.migration.ui",
- org.eclipse.emf.edapt.migration.execution;version="1.3.0",
- org.eclipse.emf.edapt.spi.history;version="1.3.0",
- org.eclipse.emf.edapt.spi.history.impl;version="1.3.0",
- org.eclipse.emf.edapt.spi.history.util;version="1.3.0"
+Export-Package: org.eclipse.emf.edapt.history.reconstruction;version="1.3.1";
+ x-friends:="org.eclipse.emf.edapt.history.cdo,
+ org.eclipse.emf.edapt.history.edit,
+ org.eclipse.emf.edapt.history.editor",
+ org.eclipse.emf.edapt.history.recorder;version="1.3.1";x-friends:="org.eclipse.emf.edapt.history.edit",
+ org.eclipse.emf.edapt.history.util;version="1.3.1";
+ x-friends:="org.eclipse.emf.edapt.history.cdo,
+ org.eclipse.emf.edapt.history.edit,
+ org.eclipse.emf.edapt.history.editor,
+ org.eclipse.emf.edapt.migration.test,
+ org.eclipse.emf.edapt.migration.ui",
+ org.eclipse.emf.edapt.internal.migration.execution;version="1.3.1",
+ org.eclipse.emf.edapt.internal.migration.execution.internal;version="1.3.1";
+ x-friends:="org.eclipse.emf.edapt.history.cdo,
+ org.eclipse.emf.edapt.history.edit,
+ org.eclipse.emf.edapt.history.editor,
+ org.eclipse.emf.edapt.migration.ui",
+ org.eclipse.emf.edapt.migration.execution;version="1.3.1",
+ org.eclipse.emf.edapt.spi.history;version="1.3.1",
+ org.eclipse.emf.edapt.spi.history.impl;version="1.3.1",
+ org.eclipse.emf.edapt.spi.history.util;version="1.3.1"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.declaration;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.migration;bundle-version="[1.3.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.edapt.declaration;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.migration;bundle-version="[1.3.1,2.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.edapt.spi.history.HistoryPlugin$Implementation
+Automatic-Module-Name: org.eclipse.emf.edapt.history
diff --git a/plugins/org.eclipse.emf.edapt.history/pom.xml b/plugins/org.eclipse.emf.edapt.history/pom.xml
index fb658d6..4c23348 100644
--- a/plugins/org.eclipse.emf.edapt.history/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.history/pom.xml
@@ -5,10 +5,10 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.history</artifactId>
<packaging>eclipse-plugin</packaging>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</project>
diff --git a/plugins/org.eclipse.emf.edapt.history/src/org/eclipse/emf/edapt/history/util/MoveChecker.java b/plugins/org.eclipse.emf.edapt.history/src/org/eclipse/emf/edapt/history/util/MoveChecker.java
index a9b93a8..97e9e8b 100644
--- a/plugins/org.eclipse.emf.edapt.history/src/org/eclipse/emf/edapt/history/util/MoveChecker.java
+++ b/plugins/org.eclipse.emf.edapt.history/src/org/eclipse/emf/edapt/history/util/MoveChecker.java
@@ -47,8 +47,12 @@
* change or release
*/
public static boolean canBeMoved(List<Change> changes, EObject target) {
- final List<Change> children = getChanges(getChildren(target));
- return canBeMoved(changes, target, children.size());
+ try {
+ final List<Change> children = getChanges(getChildren(target));
+ return canBeMoved(changes, target, children.size());
+ } catch (final IllegalStateException ex) {
+ return false;
+ }
}
/**
@@ -57,33 +61,37 @@
*/
public static boolean canBeMoved(List<Change> changes, EObject target,
int targetIndex) {
- if (!allowedTarget(changes, target)) {
- return false;
- }
- for (final Change change : changes) {
- final EObject source = change.eContainer();
- final int sourceIndex = getIndex(change);
+ try {
+ if (!allowedTarget(changes, target)) {
+ return false;
+ }
+ for (final Change change : changes) {
+ final EObject source = change.eContainer();
+ final int sourceIndex = getIndex(change);
- if (source == target && sourceIndex == targetIndex) {
- // nothing has to be done
- } else if (before(source, sourceIndex, target, targetIndex)) {
- final List<Change> difference = getDifference(source,
- sourceIndex + 1, target, targetIndex);
- difference.removeAll(changes);
- if (DependencyChecker.depends(difference, Collections
- .singletonList(change))) {
- return false;
- }
- } else {
- final List<Change> difference = getDifference(target, targetIndex,
- source, sourceIndex - 1);
- difference.removeAll(changes);
- if (DependencyChecker.depends(change, difference)) {
- return false;
+ if (source == target && sourceIndex == targetIndex) {
+ // nothing has to be done
+ } else if (before(source, sourceIndex, target, targetIndex)) {
+ final List<Change> difference = getDifference(source,
+ sourceIndex + 1, target, targetIndex);
+ difference.removeAll(changes);
+ if (DependencyChecker.depends(difference, Collections
+ .singletonList(change))) {
+ return false;
+ }
+ } else {
+ final List<Change> difference = getDifference(target, targetIndex,
+ source, sourceIndex - 1);
+ difference.removeAll(changes);
+ if (DependencyChecker.depends(change, difference)) {
+ return false;
+ }
}
}
+ return true;
+ } catch (final IllegalStateException ex) {
+ return false;
}
- return true;
}
/**
@@ -152,7 +160,8 @@
difference.addAll(changes);
difference.addAll(getDifference(source.eContainer(),
source instanceof Delete ? getIndex(source)
- : getIndex(source) + 1, target, targetIndex));
+ : getIndex(source) + 1,
+ target, targetIndex));
}
return difference;
}
@@ -186,6 +195,9 @@
* Get the index of an element within its container element
*/
private static int getIndex(EObject element) {
+ if (element == null || element.eContainer() == null || element.eContainmentFeature() == null) {
+ throw new IllegalStateException();
+ }
return ((List) element.eContainer().eGet(element.eContainmentFeature()))
.indexOf(element);
}
diff --git a/plugins/org.eclipse.emf.edapt.migration.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.migration.test/META-INF/MANIFEST.MF
index a842311..30e1a77 100644
--- a/plugins/org.eclipse.emf.edapt.migration.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.migration.test/META-INF/MANIFEST.MF
@@ -2,21 +2,22 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.migration.test;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Activator: org.eclipse.emf.edapt.migration.test.TestPlugin$Implementation
Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.history;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.edapt.history.edit;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.edapt.migration;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.history;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.edapt.history.edit;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.emf.edapt.migration;bundle-version="[1.3.1,2.0.0)";visibility:=reexport,
org.junit;bundle-version="[4.0.0,5.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.migration.test;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.migration.test.impl;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.migration.test.util;version="1.3.0";x-internal:="true"
+Export-Package: org.eclipse.emf.edapt.migration.test;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.migration.test.impl;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.migration.test.util;version="1.3.1";x-internal:=true
Bundle-Vendor: %providerName
+Automatic-Module-Name: org.eclipse.emf.edapt.migration.test
diff --git a/plugins/org.eclipse.emf.edapt.migration.test/pom.xml b/plugins/org.eclipse.emf.edapt.migration.test/pom.xml
index 01c4400..2f5f3b8 100644
--- a/plugins/org.eclipse.emf.edapt.migration.test/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.migration.test/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.migration.test</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.migration.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.migration.ui/META-INF/MANIFEST.MF
index 011d319..d76203f 100644
--- a/plugins/org.eclipse.emf.edapt.migration.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.migration.ui/META-INF/MANIFEST.MF
@@ -2,20 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.migration.ui;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-Activator: org.eclipse.emf.edapt.migration.ui.MigrationUIActivator
Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.edapt.common.ui;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.emf.edapt.common.ui;bundle-version="[1.3.1,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.edapt.history;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emf.edapt.history;bundle-version="[1.3.1,2.0.0)",
org.eclipse.debug.core;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.7.0,4.0.0)",
org.eclipse.jdt.debug.ui;bundle-version="[3.6.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.migration.ui;version="1.3.0";x-internal:="true"
+Export-Package: org.eclipse.emf.edapt.migration.ui;version="1.3.1";x-internal:=true
Bundle-Vendor: %providerName
Bundle-Localization: plugin
+Automatic-Module-Name: org.eclipse.emf.edapt.migration.ui
diff --git a/plugins/org.eclipse.emf.edapt.migration.ui/pom.xml b/plugins/org.eclipse.emf.edapt.migration.ui/pom.xml
index e195b21..4ef72c2 100644
--- a/plugins/org.eclipse.emf.edapt.migration.ui/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.migration.ui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.migration.ui</artifactId>
diff --git a/plugins/org.eclipse.emf.edapt.migration/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edapt.migration/META-INF/MANIFEST.MF
index 811dc3f..f27cdaf 100644
--- a/plugins/org.eclipse.emf.edapt.migration/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edapt.migration/META-INF/MANIFEST.MF
@@ -2,22 +2,27 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.migration;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.emf.edapt.internal.migration;version="1.3.0",
- org.eclipse.emf.edapt.internal.migration.impl;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.internal.migration.internal;version="1.3.0";x-friends:="org.eclipse.emf.edapt.history, org.eclipse.emf.edapt.history.cdo, org.eclipse.emf.edapt.migration.test, org.eclipse.emf.edapt.migration.ui",
- org.eclipse.emf.edapt.migration;version="1.3.0",
- org.eclipse.emf.edapt.spi.migration;version="1.3.0",
- org.eclipse.emf.edapt.spi.migration.impl;version="1.3.0",
- org.eclipse.emf.edapt.spi.migration.util;version="1.3.0"
+Export-Package: org.eclipse.emf.edapt.internal.migration;version="1.3.1",
+ org.eclipse.emf.edapt.internal.migration.impl;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.internal.migration.internal;version="1.3.1";
+ x-friends:="org.eclipse.emf.edapt.history,
+ org.eclipse.emf.edapt.history.cdo,
+ org.eclipse.emf.edapt.migration.test,
+ org.eclipse.emf.edapt.migration.ui",
+ org.eclipse.emf.edapt.migration;version="1.3.1",
+ org.eclipse.emf.edapt.spi.migration;version="1.3.1",
+ org.eclipse.emf.edapt.spi.migration.impl;version="1.3.1",
+ org.eclipse.emf.edapt.spi.migration.util;version="1.3.1"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)";visibility:=reexport,
org.eclipse.ocl.ecore;bundle-version="[3.1.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.7.0,3.0.0)",
- org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)"
+ org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.edapt.spi.migration.MigrationPlugin$Implementation
+Automatic-Module-Name: org.eclipse.emf.edapt.migration
diff --git a/plugins/org.eclipse.emf.edapt.migration/build.properties b/plugins/org.eclipse.emf.edapt.migration/build.properties
index 1239380..415bb7c 100644
--- a/plugins/org.eclipse.emf.edapt.migration/build.properties
+++ b/plugins/org.eclipse.emf.edapt.migration/build.properties
@@ -20,8 +20,10 @@
META-INF/,\
plugin.xml,\
plugin.properties,\
- about.html
+ about.html,\
+ schema/
jars.compile.order = .
source.. = src/,\
generated-src/
-src.includes = about.html
+src.includes = about.html,\
+ schema/
diff --git a/plugins/org.eclipse.emf.edapt.migration/pom.xml b/plugins/org.eclipse.emf.edapt.migration/pom.xml
index 23e58dc..1c5e05d 100644
--- a/plugins/org.eclipse.emf.edapt.migration/pom.xml
+++ b/plugins/org.eclipse.emf.edapt.migration/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>edapt</groupId>
<artifactId>org.eclipse.emf.edapt.migration</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 0e4056d..a32da40 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<relativePath>../builds/org.eclipse.emf.edapt.releng</relativePath>
</parent>
diff --git a/tests/org.eclipse.emf.edapt.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.edapt.common.tests/META-INF/MANIFEST.MF
index dcd26a7..32ab18b 100644
--- a/tests/org.eclipse.emf.edapt.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.edapt.common.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: Edapt.Common Tests
Bundle-SymbolicName: org.eclipse.emf.edapt.common.tests
-Bundle-Version: 1.3.0.qualifier
-Fragment-Host: org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)"
+Bundle-Version: 1.3.1.qualifier
+Fragment-Host: org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.edapt.internal.common;version="1.3.0";x-internal:="true"
+Export-Package: org.eclipse.emf.edapt.internal.common;version="1.3.1";x-internal:=true
+Automatic-Module-Name: org.eclipse.emf.edapt.common.tests
diff --git a/tests/org.eclipse.emf.edapt.common.tests/pom.xml b/tests/org.eclipse.emf.edapt.common.tests/pom.xml
index 27decbd..ca61d9e 100644
--- a/tests/org.eclipse.emf.edapt.common.tests/pom.xml
+++ b/tests/org.eclipse.emf.edapt.common.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<relativePath>../../builds/org.eclipse.emf.edapt.releng</relativePath>
</parent>
<groupId>edapt</groupId>
diff --git a/tests/org.eclipse.emf.edapt.rcptt/AllTests.suite b/tests/org.eclipse.emf.edapt.rcptt/AllTests.suite
index 76f4bb0..d735928 100644
--- a/tests/org.eclipse.emf.edapt.rcptt/AllTests.suite
+++ b/tests/org.eclipse.emf.edapt.rcptt/AllTests.suite
@@ -4,8 +4,8 @@
Element-Type: testsuite
Element-Version: 2.0
Id: _D99h4AkREeWg38ag0nnchw
-Runtime-Version: 2.2.0.201706152316
-Save-Time: 11/15/17 3:35 PM
+Runtime-Version: 2.3.0.201804052311
+Save-Time: 6/11/18 12:59 PM
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8
Content-Type: text/testcase
@@ -20,5 +20,6 @@
_spU9wAkQEeWg38ag0nnchw // kind: 'test' name: 'Select Change' path: 'reconstruction_view/Select Change.test'
_aedIALQUEee_6uXiZb2DRg // kind: 'test' name: 'Breaking change indication' path: 'general/Breaking change indication.test'
_ExiWUMoSEeeVv4pPxMNi2w // kind: 'test' name: 'Multiple ecores' path: 'general/Multiple ecores.test'
+_wXzbsG1lEeiv5_IJNNSbGg // kind: 'test' name: 'Extension Points' path: 'general/Extension Points.test'
------=_testcase-items-62c497da-4241-31f4-811a-6b453a3ecff8--
diff --git a/tests/org.eclipse.emf.edapt.rcptt/general/Extension Points.test b/tests/org.eclipse.emf.edapt.rcptt/general/Extension Points.test
new file mode 100644
index 0000000..2f77cdb
--- /dev/null
+++ b/tests/org.eclipse.emf.edapt.rcptt/general/Extension Points.test
@@ -0,0 +1,53 @@
+--- RCPTT testcase ---
+Format-Version: 1.0
+Contexts: _bma0MAkBEeWg38ag0nnchw,_CqPtsAkFEeWg38ag0nnchw,_NFFKUAkEEeWg38ag0nnchw,_3TFIgAkBEeWg38ag0nnchw,_rv0HYAkGEeWg38ag0nnchw,_qYMXsAkHEeWg38ag0nnchw
+Element-Name: Extension Points
+Element-Type: testcase
+Element-Version: 3.0
+External-Reference:
+Id: _wXzbsG1lEeiv5_IJNNSbGg
+Runtime-Version: 2.3.0.201804052311
+Save-Time: 6/11/18 12:58 PM
+Testcase-Type: ecl
+
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
+Content-Type: text/ecl
+Entry-Name: .content
+
+get-view "Package Explorer" | get-tree | select "org.eclipse.emf.ecp.makeithappen.model/META-INF/MANIFEST.MF"
+ | double-click
+with [get-editor "org.eclipse.emf.ecp.makeithappen.model"] {
+ get-tab-folder | get-tab-item Extensions | click
+ get-section "All Extensions" | get-button "Add..." | click
+}
+with [get-window "New Extension"] {
+ with [get-editbox -after [get-label "Extension Point filter:"]] {
+ set-text edapt
+ key-type Left -times 17
+ set-text "*edapt"
+ }
+ get-button "Show only extension points from the required plug-ins" | uncheck
+ get-table | select "org.eclipse.emf.edapt.migrators"
+ get-button Finish | click
+ get-window "New plug-in dependency" | get-button No | click
+}
+get-editor "org.eclipse.emf.ecp.makeithappen.model" | get-section "Extension Element Details" | get-button "Browse..."
+ | click
+with [get-window "Resource Attribute Value"] {
+ get-tree | select "org.eclipse.emf.ecp.makeithappen.model/model/task.history"
+ get-button OK | click
+}
+get-editor "org.eclipse.emf.ecp.makeithappen.model" | get-section "All Extensions" | get-button "Add..." | click
+with [get-window "New Extension"] {
+ get-editbox -after [get-label "Extension Point filter:"] | set-text "*edapt"
+ get-button "Show only extension points from the required plug-ins" | uncheck
+ get-table | select "org.eclipse.emf.edapt.factories"
+ get-button Finish | click
+ get-window "New plug-in dependency" | get-button No | click
+}
+with [get-editor "org.eclipse.emf.ecp.makeithappen.model" | get-section "Extension Element Details"] {
+ get-label "nsURI*:" | get-property caption | equals "nsURI*:" | verify-true
+ get-link "class*:" | get-property caption | equals "class*:" | verify-true
+ get-label "useWildcards:" | get-property caption | equals "useWildcards:" | verify-true
+}
+------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/tests/org.eclipse.emf.edapt.rcptt/pom.xml b/tests/org.eclipse.emf.edapt.rcptt/pom.xml
index c184e27..d22a239 100644
--- a/tests/org.eclipse.emf.edapt.rcptt/pom.xml
+++ b/tests/org.eclipse.emf.edapt.rcptt/pom.xml
@@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.edapt</groupId>
<artifactId>org.eclipse.emf.edapt.rcptt</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<packaging>rcpttTest</packaging>
<properties>
- <rcptt-maven-version>2.2.0</rcptt-maven-version>
- <rcptt-runner-version>2.2.0</rcptt-runner-version>
+ <rcptt-maven-version>2.3.0</rcptt-maven-version>
+ <rcptt-runner-version>2.3.0</rcptt-runner-version>
<toolchains-version>1.1</toolchains-version>
</properties>
diff --git a/tests/org.eclipse.emf.edapt.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.edapt.tests/META-INF/MANIFEST.MF
index e95d483..e067e15 100644
--- a/tests/org.eclipse.emf.edapt.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.edapt.tests/META-INF/MANIFEST.MF
@@ -2,21 +2,21 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.edapt.tests;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.9.1,3.0.0)",
org.eclipse.emf.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.emf.edapt.common;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.edapt.migration.test;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.edapt.history.editor;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.edapt.migration;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.edapt.declaration.editor;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emf.edapt.common;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.emf.edapt.migration.test;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.emf.edapt.history.editor;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.emf.edapt.migration;bundle-version="[1.3.1,2.0.0)",
+ org.eclipse.emf.edapt.declaration.editor;bundle-version="[1.3.1,2.0.0)",
org.junit;bundle-version="[4.11.0,5.0.0)",
org.mockito.mockito-core-hamcrest-modified;bundle-version="[1.9.5,2.0.0)",
org.objenesis;bundle-version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.edapt.tests.declaration;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.tests.history;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.tests.migration;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.tests.migration.custom;version="1.3.0";x-internal:="true",
- org.eclipse.emf.edapt.tests.util;version="1.3.0";x-internal:="true"
+Export-Package: org.eclipse.emf.edapt.tests.declaration;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.tests.history;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.tests.migration;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.tests.migration.custom;version="1.3.1";x-internal:=true,
+ org.eclipse.emf.edapt.tests.util;version="1.3.1";x-internal:=true
Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.emf.edapt.tests/pom.xml b/tests/org.eclipse.emf.edapt.tests/pom.xml
index d6d952f..8686f84 100644
--- a/tests/org.eclipse.emf.edapt.tests/pom.xml
+++ b/tests/org.eclipse.emf.edapt.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>edapt</groupId>
<artifactId>root</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<relativePath>../../builds/org.eclipse.emf.edapt.releng</relativePath>
</parent>
<groupId>edapt</groupId>
